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); |
}; |