Merge commit 'adae78ea9940f4d44382967d1296e7db0b54a4de' into leveldb-squashed

2013-07-01 08:36:32 -07:00
parent 28bcf3b7ef adae78ea99
commit fb1da62318
18 changed files with 190 additions and 59 deletions
--- a/src/leveldb/util/comparator.cc
+++ b/src/leveldb/util/comparator.cc
@@ -66,7 +66,7 @@ class BytewiseComparatorImpl : public Comparator {
 };
 }  // namespace

-static port::OnceType once = LEVELDB_ONCE_INIT;
+static port::OnceType once_comparator = LEVELDB_ONCE_INIT;
 static const Comparator* bytewise;

 static void InitModule() {
@@ -74,7 +74,7 @@ static void InitModule() {
 }

 const Comparator* BytewiseComparator() {
-  port::InitOnce(&once, InitModule);
+  port::InitOnce(&once_comparator, InitModule);
  return bytewise;
 }