third_party/protobuf/src/google/protobuf/compiler/java/java_extension.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_extension.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_enum_lite.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/java/java_extension.cc » ('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_extension.h

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

index bdd4226379b04a81cc8b4cbd5ab0c6b803421de8..fb8d52015bb0311b4a0590a61ae95dd9d4c72ebf 100644

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

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

@@ -79,7 +79,7 @@ class ExtensionGenerator {

const string& scope,

bool immutable,

ClassNameResolver* name_resolver,

- map<string, string>* vars_pointer);

+ std::map<string, string>* vars_pointer);

private:

GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ExtensionGenerator);