Merge commit '84d6d69fc69662b2709fffbeaf3c3b4f53c535b1'

2013-08-18 00:58:04 +02:00
parent 317f57ec87 84d6d69fc6
commit 4a9a8f3f48
6 changed files with 107 additions and 9 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_comparator = LEVELDB_ONCE_INIT;
+static port::OnceType once = LEVELDB_ONCE_INIT;
 static const Comparator* bytewise;

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

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