third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum_field.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/cpp/cpp_enum_field.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/cpp/cpp_enum.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum_field.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum_field.h

diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum_field.h b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum_field.h

index fe21c575742d7d4883ab7f4d42d41fd74ead2fe7..3ecd7ba8711556b3cd5ad2f65f41cc28c56d1708 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum_field.h

+++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum_field.h

@@ -58,6 +58,7 @@ class EnumFieldGenerator : public FieldGenerator {

void GenerateMergingCode(io::Printer* printer) const;

void GenerateSwappingCode(io::Printer* printer) const;

void GenerateConstructorCode(io::Printer* printer) const;

+ void GenerateCopyConstructorCode(io::Printer* printer) const;

void GenerateMergeFromCodedStream(io::Printer* printer) const;

void GenerateSerializeWithCachedSizes(io::Printer* printer) const;

void GenerateSerializeWithCachedSizesToArray(io::Printer* printer) const;

@@ -65,7 +66,7 @@ class EnumFieldGenerator : public FieldGenerator {

protected:

const FieldDescriptor* descriptor_;

- map<string, string> variables_;

+ std::map<string, string> variables_;

private:

GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumFieldGenerator);

@@ -103,6 +104,7 @@ class RepeatedEnumFieldGenerator : public FieldGenerator {

void GenerateMergingCode(io::Printer* printer) const;

void GenerateSwappingCode(io::Printer* printer) const;

void GenerateConstructorCode(io::Printer* printer) const;

+ void GenerateCopyConstructorCode(io::Printer* printer) const {}

void GenerateMergeFromCodedStream(io::Printer* printer) const;

void GenerateMergeFromCodedStreamWithPacking(io::Printer* printer) const;

void GenerateSerializeWithCachedSizes(io::Printer* printer) const;

@@ -111,7 +113,7 @@ class RepeatedEnumFieldGenerator : public FieldGenerator {

private:

const FieldDescriptor* descriptor_;

- map<string, string> variables_;

+ std::map<string, string> variables_;

GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedEnumFieldGenerator);

};