From e353fbc7ea81f12a5694991b708f8f45343594b1 Mon Sep 17 00:00:00 2001 From: Chris Mumford Date: Thu, 1 May 2014 13:43:12 -0700 Subject: Release LevelDB 1.17 - Cleanup: delete unused IntSetToString It was added in http://cr/19491949 (and was referenced at the time). The last reference was removed in http://cr/19507363. This fixes warning/error with pre-release crosstoolv18: 'std::string leveldb::{anonymous}::IntSetToString(const std::set&)' defined but not used [-Werror=unused-function] - Added arm64 and and armv7s to IOS build as suggested on leveldb mailing list. - Changed local variable type from int to size_t This eliminates compiler warning/error and resolves https://code.google.com/p/leveldb/issues/detail?id=140 --- include/leveldb/db.h | 2 +- include/leveldb/slice.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/leveldb/db.h b/include/leveldb/db.h index 4f3a851..40851b2 100644 --- a/include/leveldb/db.h +++ b/include/leveldb/db.h @@ -14,7 +14,7 @@ namespace leveldb { // Update Makefile if you change these static const int kMajorVersion = 1; -static const int kMinorVersion = 16; +static const int kMinorVersion = 17; struct Options; struct ReadOptions; diff --git a/include/leveldb/slice.h b/include/leveldb/slice.h index 74ea8fa..bc36798 100644 --- a/include/leveldb/slice.h +++ b/include/leveldb/slice.h @@ -94,7 +94,7 @@ inline bool operator!=(const Slice& x, const Slice& y) { } inline int Slice::compare(const Slice& b) const { - const int min_len = (size_ < b.size_) ? size_ : b.size_; + const size_t min_len = (size_ < b.size_) ? size_ : b.size_; int r = memcmp(data_, b.data_, min_len); if (r == 0) { if (size_ < b.size_) r = -1; -- cgit v1.2.1