[Commits] 64a271f: Make RocksDB SE compile in webscale.

Sergei Petrunia psergey at askmonty.org
Sat Jul 12 00:22:06 EEST 2014


revision-id: 64a271f72755c5007ee0659716fc151b1a9f65d4
parent(s): 7a1df1129fc3515107344399c83a7db74800c9cf
committer: Sergei Petrunia
branch nick: webscalesql-5.6
timestamp: 2014-07-12 01:22:06 +0400
message:

Make RocksDB SE compile in webscale.

-----------------------

 storage/rocksdb/CMakeLists.txt |    2 +-
 storage/rocksdb/rdb_rowmods.h  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt
index ced0b96..4dc48d1 100644
--- a/storage/rocksdb/CMakeLists.txt
+++ b/storage/rocksdb/CMakeLists.txt
@@ -31,7 +31,7 @@ ENDIF()
 INCLUDE_DIRECTORIES(AFTER ${Rocksdb_INCLUDE_DIRS})
 SET(CMAKE_REQUIRED_INCLUDES ${Rocksdb_INCLUDE_DIRS})
 
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
+# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
 
 # TODO is there a better way to do this?
 #LINK_LIBRARIES(snappy bz2)
diff --git a/storage/rocksdb/rdb_rowmods.h b/storage/rocksdb/rdb_rowmods.h
index bc5a53c..65031fc 100644
--- a/storage/rocksdb/rdb_rowmods.h
+++ b/storage/rocksdb/rdb_rowmods.h
@@ -131,7 +131,7 @@ public:
   /* This may return false when there are really no changes (TODO: still true?) */
   bool is_empty()
   {
-    return test(tree.elements_in_tree == 0);
+    return (tree.elements_in_tree == 0);
   };
 private:
   static int compare_rows(const void* arg, const void *a,const void *b);


More information about the commits mailing list