diff options
| author | jorlow@chromium.org <jorlow@chromium.org@62dab493-f737-651d-591e-8d6aee1b9529> | 2011-03-21 21:06:49 +0000 |
|---|---|---|
| committer | jorlow@chromium.org <jorlow@chromium.org@62dab493-f737-651d-591e-8d6aee1b9529> | 2011-03-21 21:06:49 +0000 |
| commit | 4bcb23118777b0666ad518c6b730a953d8f7bc89 (patch) | |
| tree | 41d6dd399da185d7c5a1a89148f41d0f21c81773 | |
| parent | 0e389254905fc246271ca991e203d95031c93559 (diff) | |
| download | leveldb-4bcb23118777b0666ad518c6b730a953d8f7bc89.tar.gz | |
more upstream changes
git-svn-id: https://leveldb.googlecode.com/svn/trunk@10 62dab493-f737-651d-591e-8d6aee1b9529
| -rw-r--r-- | port/port_chromium.cc | 1 | ||||
| -rw-r--r-- | util/env_chromium.cc | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/port/port_chromium.cc b/port/port_chromium.cc index e25c1b7..4026aa3 100644 --- a/port/port_chromium.cc +++ b/port/port_chromium.cc @@ -8,7 +8,6 @@ #if defined(USE_SNAPPY) # include "third_party/snappy/src/snappy.h" -# include "snappy-stubs-public.h" #endif namespace leveldb { diff --git a/util/env_chromium.cc b/util/env_chromium.cc index e39ac71..49666f6 100644 --- a/util/env_chromium.cc +++ b/util/env_chromium.cc @@ -594,10 +594,8 @@ void ChromiumEnv::StartThread(void (*function)(void* arg), void* arg) { new Thread(function, arg); // Will self-delete. } -// TODO(jorlow): This won't co-exist with Chrome. Need to find a better way. -::base::AtExitManager exit_manager; - -::base::LazyInstance<ChromiumEnv> default_env(::base::LINKER_INITIALIZED); +::base::LazyInstance<ChromiumEnv, ::base::LeakyLazyInstanceTraits<ChromiumEnv> > + default_env(::base::LINKER_INITIALIZED); } |