content/common/np_channel_base.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: content/common/np_channel_base.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:

Index: content/common/np_channel_base.cc

diff --git a/content/common/np_channel_base.cc b/content/common/np_channel_base.cc

index 62ea1e2599bccced5b85f0ce96471ab878f2bd3b..7b721193479d70e96072e4b16f205f4719a05d7c 100644

--- a/content/common/np_channel_base.cc

+++ b/content/common/np_channel_base.cc

@@ -19,12 +19,12 @@

typedef base::hash_map<std::string, scoped_refptr<NPChannelBase> > ChannelMap;

static base::LazyInstance<ChannelMap,

base::LeakyLazyInstanceTraits<ChannelMap> >

- g_channels(base::LINKER_INITIALIZED);

+ g_channels = LAZY_INSTANCE_INITIALIZER;

typedef std::stack<scoped_refptr<NPChannelBase> > NPChannelRefStack;

static base::LazyInstance<NPChannelRefStack,

base::LeakyLazyInstanceTraits<NPChannelRefStack> >

- g_lazy_channel_stack(base::LINKER_INITIALIZED);

+ g_lazy_channel_stack = LAZY_INSTANCE_INITIALIZER;

static int next_pipe_id = 0;

« no previous file with comments | « content/common/net/url_fetcher_impl.cc ('k') | content/common/socket_stream_dispatcher.cc » ('j') | no next file with comments »