aboutsummaryrefslogtreecommitdiff
path: root/include/leveldb/slice.h
diff options
context:
space:
mode:
authorcmumford@chromium.org <cmumford@chromium.org@62dab493-f737-651d-591e-8d6aee1b9529>2014-05-01 21:32:34 +0000
committercmumford@chromium.org <cmumford@chromium.org@62dab493-f737-651d-591e-8d6aee1b9529>2014-05-01 21:32:34 +0000
commit3f77584eb3f9754bbb7079070873ece3f30a1e6b (patch)
tree5f3d89f7cf518f6e2d971e0ae4d8299629f90166 /include/leveldb/slice.h
parente9c65d24cda587bd317127f104bd0d52e8eea952 (diff)
downloadsrc-3f77584eb3f9754bbb7079070873ece3f30a1e6b.tar.gz
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<long unsigned int>&)' 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 git-svn-id: http://leveldb.googlecode.com/svn/trunk@80 62dab493-f737-651d-591e-8d6aee1b9529
Diffstat (limited to 'include/leveldb/slice.h')
-rw-r--r--include/leveldb/slice.h2
1 files changed, 1 insertions, 1 deletions
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;