Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(525)

Unified Diff: crypto/nss_util.cc

Issue 8491043: Allow linker initialization of lazy instance (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: willchan comments + rebase Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/worker/worker_thread.cc ('k') | ipc/ipc_sync_channel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/nss_util.cc
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 803b01c7b2472bba85aed846c84e9728498b4b21..6bebd0d6df78b4e3ba4ccbdee0221e769736b7e3 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -219,7 +219,7 @@ class NSPRInitSingleton {
base::LazyInstance<NSPRInitSingleton,
base::LeakyLazyInstanceTraits<NSPRInitSingleton> >
- g_nspr_singleton(base::LINKER_INITIALIZED);
+ g_nspr_singleton = LAZY_INSTANCE_INITIALIZER;
class NSSInitSingleton {
public:
@@ -614,7 +614,7 @@ bool NSSInitSingleton::force_nodb_init_ = false;
base::LazyInstance<NSSInitSingleton,
base::LeakyLazyInstanceTraits<NSSInitSingleton> >
- g_nss_singleton(base::LINKER_INITIALIZED);
+ g_nss_singleton = LAZY_INSTANCE_INITIALIZER;
} // namespace
« no previous file with comments | « content/worker/worker_thread.cc ('k') | ipc/ipc_sync_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698