summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Mumford <cmumford@cmumford.com>2016-02-24 14:39:03 -0800
committerChris Mumford <cmumford@cmumford.com>2016-02-24 14:39:03 -0800
commit7306ef856a91e462a73ff1832c1fa8771008ba36 (patch)
tree3bc74a57a1c8b725de30a117fb0ba2fd1261b241
parentadbe3eb073565c468005c48f18d16b8f1dd6ef58 (diff)
parent6b18316d011e495b42ca84813936c994cd90e88d (diff)
downloadleveldb-7306ef856a91e462a73ff1832c1fa8771008ba36.tar.gz
Merge pull request #348 from randomascii/master
Fix signed/unsigned mismatch on VC++ builds
-rw-r--r--db/skiplist_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/skiplist_test.cc b/db/skiplist_test.cc
index c78f4b4..aee1461 100644
--- a/db/skiplist_test.cc
+++ b/db/skiplist_test.cc
@@ -250,7 +250,7 @@ class ConcurrentTest {
// Note that generation 0 is never inserted, so it is ok if
// <*,0,*> is missing.
ASSERT_TRUE((gen(pos) == 0) ||
- (gen(pos) > initial_state.Get(key(pos)))
+ (gen(pos) > static_cast<Key>(initial_state.Get(key(pos))))
) << "key: " << key(pos)
<< "; gen: " << gen(pos)
<< "; initgen: "