Fixed xfunc related compile errors in ROCKSDB_LITE

Summary:
Fixed xfunc related compile errors in ROCKSDB_LITE

Now make OPT=-DROCKSDB_LITE shared_lib -j32 would work

Test Plan:
make clean
make OPT=-DROCKSDB_LITE shared_lib -j32
make clean
make OPT=-DROCKSDB_LITE static_lib -j32

Reviewers: sdong, igor

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D36825

diff --git a/db/managed_iterator.h b/db/managed_iterator.h
index 3a551dff9fbc62d00d5a34e05127bbd2f0052ede..00f56aea48b9c9a1ffc282ece42bbf8df9c27552 100644 (file)
--- a/db/managed_iterator.h
+++ b/db/managed_iterator.h
@@ -81,4 +81,4 @@ class ManagedIterator : public Iterator {
 };
 
 }  // namespace rocksdb
-#endif  // ROCKSDB_LITE
+#endif  // !ROCKSDB_LITE

diff --git a/util/options.cc b/util/options.cc
index 3b47c36966c8803d6b35793bdabfbf727091be73..b125367dccfad726e1983e0a500b8478bac8d362 100644 (file)
--- a/util/options.cc
+++ b/util/options.cc
@@ -611,6 +611,8 @@ DBOptions* DBOptions::IncreaseParallelism(int total_threads) {
   return this;
 }
 
+#endif  // !ROCKSDB_LITE
+
 ReadOptions::ReadOptions()
     : verify_checksums(true),
       fill_cache(true),
@@ -637,6 +639,4 @@ ReadOptions::ReadOptions(bool cksum, bool cache)
              reinterpret_cast<ReadOptions*>(this));
 }
 
-#endif  // ROCKSDB_LITE
-
 }  // namespace rocksdb

diff --git a/util/xfunc.cc b/util/xfunc.cc
index aadc8974ea069966cc1d41c9db838ea7c5393f73..c5d6b5afdacc533a752cdb12604c83acf9a084cc 100644 (file)
--- a/util/xfunc.cc
+++ b/util/xfunc.cc
@@ -3,13 +3,13 @@
 //  LICENSE file in the root directory of this source tree. An additional grant
 //  of patent rights can be found in the PATENTS file in the same directory.
 
+#ifdef XFUNC
 #include <string>
 #include "db/db_impl.h"
 #include "db/managed_iterator.h"
 #include "rocksdb/options.h"
 #include "util/xfunc.h"
 
-#ifdef XFUNC
 
 namespace rocksdb {
 

diff --git a/util/xfunc.h b/util/xfunc.h
index 87daa824a4454e1a57e71f369e41a1aa1b874d68..78004cbe0ce388938f8a6c95239de9208a41919f 100644 (file)
--- a/util/xfunc.h
+++ b/util/xfunc.h
@@ -17,13 +17,15 @@ namespace rocksdb {
  *   with XFUNC only being set for debug builds.
  */
 #if defined(ROCKSDB_XFTEST_FORCE)
+#ifndef ROCKSDB_LITE
 #if (ROCKSDB_XFTEST_FORCE == 1)
 #define XFUNC
-#endif
+#endif  // ROCKSDB_XFTEST_FORCE == 1
 #elif defined(NDEBUG)
 #else
 #define XFUNC
-#endif
+#endif  // defined(ROCKSDB_XFTEST_FORCE)
+#endif  // !ROCKSDB_LITE
 
 #ifndef XFUNC
 #define XFUNC_TEST(condition, location, lfname, fname, ...)