From: Igor Canadi Date: Tue, 2 Sep 2014 17:50:15 +0000 (-0700) Subject: Fix ios compile X-Git-Tag: v3.5~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=990df99a610def4378be69465a407703b441b19b;p=rocksdb.git Fix ios compile 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 --- diff --git a/db/internal_stats.cc b/db/internal_stats.cc index 34eb99781..3142d13b3 100644 --- a/db/internal_stats.cc +++ b/db/internal_stats.cc @@ -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; } diff --git a/table/block_builder.h b/table/block_builder.h index eb7c49f7d..a63e7c795 100644 --- a/table/block_builder.h +++ b/table/block_builder.h @@ -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 restarts_; // Restart points