third_party/protobuf/src/google/protobuf/generated_message_util.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/generated_message_util.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/generated_message_util.h

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

index 098f3219806df4cb4333f384cef9609a1ddf3de5..6e4669c271a858c3a0028f7e2447cbf6c90889b7 100644

--- a/third_party/protobuf/src/google/protobuf/generated_message_util.h

+++ b/third_party/protobuf/src/google/protobuf/generated_message_util.h

@@ -67,10 +67,7 @@ LIBPROTOBUF_EXPORT extern ProtobufOnceType empty_string_once_init_;

LIBPROTOBUF_EXPORT void InitEmptyString();

-LIBPROTOBUF_EXPORT inline const ::std::string& GetEmptyString() {

- GoogleOnceInit(&empty_string_once_init_, &InitEmptyString);

- return *empty_string_;

+LIBPROTOBUF_EXPORT const ::std::string& GetEmptyString();

// Defined in generated_message_reflection.cc -- not actually part of the lite

// library.