NextGraph
/
rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix travis (compile for clang < 3.9)

Browse Source 
Summary:
Travis fail because it uses clang 3.6 which don't recognize
`__attribute__((__no_sanitize__("undefined")))`
Closes https://github.com/facebook/rocksdb/pull/1601

Differential Revision: D4257175

Pulled By: IslamAbdelRahman

fbshipit-source-id: fb4d1ab
main
Islam AbdelRahman 8 years ago committed by Facebook Github Bot
parent 3f407b065c
commit e39d080871
3 changed files with 3 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      db/fault_injection_test.cc
  2. 2
      util/hash.cc
  3. 2
      utilities/col_buf_encoder.cc

2
db/fault_injection_test.cc
Unescape View File

@ -228,7 +228,7 @@ class FaultInjectionTest : public testing::Test,
return Status::OK(); return Status::OK();
} }
#if defined(__clang__) #if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 9)
__attribute__((__no_sanitize__("undefined"))) __attribute__((__no_sanitize__("undefined")))
#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)
__attribute__((__no_sanitize_undefined__)) __attribute__((__no_sanitize_undefined__))

2
util/hash.cc
Unescape View File

@ -14,7 +14,7 @@
namespace rocksdb { namespace rocksdb {
// This function may intentionally do a left shift on a -ve number // This function may intentionally do a left shift on a -ve number
#if defined(__clang__) #if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 9)
__attribute__((__no_sanitize__("undefined"))) __attribute__((__no_sanitize__("undefined")))
#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)
__attribute__((__no_sanitize_undefined__)) __attribute__((__no_sanitize_undefined__))

2
utilities/col_buf_encoder.cc
Unescape View File

@ -46,7 +46,7 @@ ColBufEncoder *ColBufEncoder::NewColBufEncoder(
return nullptr; return nullptr;
} }
#if defined(__clang__) #if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 9)
__attribute__((__no_sanitize__("undefined"))) __attribute__((__no_sanitize__("undefined")))
#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)
__attribute__((__no_sanitize_undefined__)) __attribute__((__no_sanitize_undefined__))

Write Preview
Loading…
Cancel
Save