Permalink
Browse files

more upstream changes

git-svn-id: http://leveldb.googlecode.com/svn/trunk@10 62dab493-f737-651d-591e-8d6aee1b9529
  • Loading branch information...
1 parent 84744ee commit 87c528b30a91689078728c5c7c03772c7ce0201b jorlow@chromium.org committed Mar 21, 2011
Showing with 2 additions and 5 deletions.
  1. +0 −1 port/port_chromium.cc
  2. +2 −4 util/env_chromium.cc
View
@@ -8,7 +8,6 @@
#if defined(USE_SNAPPY)
# include "third_party/snappy/src/snappy.h"
-# include "snappy-stubs-public.h"
#endif
namespace leveldb {
View
@@ -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);
}

0 comments on commit 87c528b

Please sign in to comment.