third_party/protobuf/src/google/protobuf/stubs/once.h - Issue 787803004: Update from https://crrev.com/307664

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: third_party/protobuf/src/google/protobuf/stubs/once.h

Issue 787803004: Update from https://crrev.com/307664 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Rebase. Created 6 years 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: third_party/protobuf/src/google/protobuf/stubs/once.h

diff --git a/third_party/protobuf/src/google/protobuf/stubs/once.h b/third_party/protobuf/src/google/protobuf/stubs/once.h

index 7fbc117fe43c8d9519ec3870678b3b6c8d9b0453..9f1c5fc6469f5fa654a2d6b1c2eea9230ce5c1b8 100644

--- a/third_party/protobuf/src/google/protobuf/stubs/once.h

+++ b/third_party/protobuf/src/google/protobuf/stubs/once.h

@@ -121,12 +121,8 @@ typedef internal::AtomicWord ProtobufOnceType;

LIBPROTOBUF_EXPORT

void GoogleOnceInitImpl(ProtobufOnceType* once, Closure* closure);

-inline void GoogleOnceInit(ProtobufOnceType* once, void (*init_func)()) {

- if (internal::Acquire_Load(once) != ONCE_STATE_DONE) {

- internal::FunctionClosure0 func(init_func, false);

- GoogleOnceInitImpl(once, &func);

- }

+LIBPROTOBUF_EXPORT

+void GoogleOnceInit(ProtobufOnceType* once, void (*init_func)());

template <typename Arg>

inline void GoogleOnceInit(ProtobufOnceType* once, void (*init_func)(Arg*),