]> git-server-git.apps.pok.os.sepia.ceph.com Git - rocksdb.git/commitdiff
Fix ios compile
authorIgor Canadi <icanadi@fb.com>
Tue, 2 Sep 2014 17:50:15 +0000 (10:50 -0700)
committerIgor Canadi <icanadi@fb.com>
Tue, 2 Sep 2014 17:50:15 +0000 (10:50 -0700)
Summary: We need to set contbuild for this :)

Test Plan: compiles

Reviewers: sdong, yhchiang, ljin

Reviewed By: ljin

Subscribers: leveldb

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

db/internal_stats.cc
table/block_builder.h

index 34eb997810d7732013171bc111bda83a4e02f1e8..3142d13b301edb89d3148e0e609bc822f231264d 100644 (file)
@@ -257,9 +257,11 @@ bool InternalStats::GetIntProperty(DBPropertyType property_type,
                cfd_->imm()->current()->GetTotalNumEntries() +
                current->GetEstimatedActiveKeys();
       return true;
+#ifndef ROCKSDB_LITE
     case kIsFileDeletionEnabled:
       *value = db->IsFileDeletionsEnabled();
       return true;
+#endif
     default:
       return false;
   }
index eb7c49f7d55617ac7a95163b9e45fffb4e25c200..a63e7c7953a03303be1177a9b12bbb181ae2cb12 100644 (file)
@@ -50,7 +50,7 @@ class BlockBuilder {
 
  private:
   const int          block_restart_interval_;
-  const Comparator*  comparator_;
+  const Comparator* comparator_ __attribute__((unused));  // only used in assert
 
   std::string           buffer_;    // Destination buffer
   std::vector<uint32_t> restarts_;  // Restart points