third_party/protobuf/src/google/protobuf/generated_message_reflection.cc - Issue 6737030: third_party/protobuf: update to upstream r371

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_reflection.cc

Issue 6737030: third_party/protobuf: update to upstream r371 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 9 months 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 | « third_party/protobuf/src/google/protobuf/extension_set.cc ('k') | third_party/protobuf/src/google/protobuf/generated_message_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/generated_message_reflection.cc

diff --git a/third_party/protobuf/src/google/protobuf/generated_message_reflection.cc b/third_party/protobuf/src/google/protobuf/generated_message_reflection.cc

index 9c933fe8c57664c2225b9bfb035c4b17164637aa..226e9515714e6c5b4c9be37f7e84c2260aba0c56 100644

--- a/third_party/protobuf/src/google/protobuf/generated_message_reflection.cc

+++ b/third_party/protobuf/src/google/protobuf/generated_message_reflection.cc

@@ -45,8 +45,6 @@ namespace google {

namespace protobuf {

namespace internal {

-namespace { const string kEmptyString; }

bool ParseNamedEnum(const EnumDescriptor* descriptor,

const string& name,

int* value) {

@@ -57,7 +55,6 @@ bool ParseNamedEnum(const EnumDescriptor* descriptor,

}

const string& NameOfEnum(const EnumDescriptor* descriptor, int value) {

- static string kEmptyString;

const EnumValueDescriptor* d = descriptor->FindValueByNumber(value);

return (d == NULL ? kEmptyString : d->name());

}