third_party/protobuf/src/google/protobuf/compiler/java/java_name_resolver.h - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

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/compiler/java/java_name_resolver.h

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Make chrome settings proto generated file a component Created 4 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/compiler/java/java_message_lite.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/java/java_options.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/java/java_name_resolver.h

diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_name_resolver.h b/third_party/protobuf/src/google/protobuf/compiler/java/java_name_resolver.h

index 570d8d8f1fa82918e1a20840a2e3450e6bd30071..28b049d1e53e165277a0e304766649e11ef4113f 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_name_resolver.h

+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_name_resolver.h

@@ -112,7 +112,7 @@ class ClassNameResolver {

const FileDescriptor* file,

bool immutable);

// Caches the result to provide better performance.

- map<const FileDescriptor*, string> file_immutable_outer_class_names_;

+ std::map<const FileDescriptor*, string> file_immutable_outer_class_names_;

GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ClassNameResolver);

};