diff options
| author | Vinnie Falco <vinnie.falco@gmail.com> | 2013-07-01 08:36:32 -0700 |
|---|---|---|
| committer | Vinnie Falco <vinnie.falco@gmail.com> | 2013-07-01 08:36:32 -0700 |
| commit | fb1da62318f5a7f6e3ec31cdc02178a5445870e4 (patch) | |
| tree | 4ef6f0b1017c747e84132427666eea4a36d10b0d /src/leveldb/util/comparator.cc | |
| parent | 28bcf3b7ef804f7084938b21708b29c1f5d7c8f8 (diff) | |
| parent | adae78ea9940f4d44382967d1296e7db0b54a4de (diff) | |
Merge commit 'adae78ea9940f4d44382967d1296e7db0b54a4de' into leveldb-squashed
Diffstat (limited to 'src/leveldb/util/comparator.cc')
| -rw-r--r-- | src/leveldb/util/comparator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leveldb/util/comparator.cc b/src/leveldb/util/comparator.cc index 4b7b5724ef..6cc319242e 100644 --- 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; } |