crypto/nss_util.cc - Issue 8491043: Allow linker initialization of lazy instance

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: thakis comment, renamed LAZY_INSTANCE_INITIALIZER 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:

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