Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_message_field.h |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_message_field.h b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_message_field.h |
index 9ca9115313bfec91663d5b67667bfbb1045f789f..d8d9279c9712025fb8476494e796577ec589174b 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_message_field.h |
+++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_message_field.h |
@@ -59,26 +59,23 @@ class MessageFieldGenerator : public FieldGenerator { |
bool is_inline) const; |
void GenerateNonInlineAccessorDefinitions(io::Printer* printer) const; |
void GenerateClearingCode(io::Printer* printer) const; |
- void GenerateMessageClearingCode(io::Printer* printer) const; |
void GenerateMergingCode(io::Printer* printer) const; |
void GenerateSwappingCode(io::Printer* printer) const; |
- void GenerateDestructorCode(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; |
void GenerateByteSize(io::Printer* printer) const; |
protected: |
- void GenerateArenaManipulationCode(const std::map<string, string>& variables, |
+ void GenerateArenaManipulationCode(const map<string, string>& variables, |
io::Printer* printer) const; |
virtual void GenerateGetterDeclaration(io::Printer* printer) const; |
const FieldDescriptor* descriptor_; |
const bool dependent_field_; |
- std::map<string, string> variables_; |
+ map<string, string> variables_; |
private: |
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFieldGenerator); |
@@ -97,12 +94,7 @@ class MessageOneofFieldGenerator : public MessageFieldGenerator { |
bool is_inline) const; |
void GenerateNonInlineAccessorDefinitions(io::Printer* printer) const; |
void GenerateClearingCode(io::Printer* printer) const; |
- |
- // MessageFieldGenerator, from which we inherit, overrides this so we need to |
- // override it as well. |
- void GenerateMessageClearingCode(io::Printer* printer) const; |
void GenerateSwappingCode(io::Printer* printer) const; |
- void GenerateDestructorCode(io::Printer* printer) const; |
void GenerateConstructorCode(io::Printer* printer) const; |
protected: |
@@ -110,7 +102,7 @@ class MessageOneofFieldGenerator : public MessageFieldGenerator { |
private: |
void InternalGenerateInlineAccessorDefinitions( |
- const std::map<string, string>& variables, io::Printer* printer) const; |
+ const map<string, string>& variables, io::Printer* printer) const; |
const bool dependent_base_; |
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageOneofFieldGenerator); |
@@ -133,7 +125,6 @@ class RepeatedMessageFieldGenerator : 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; |
@@ -146,7 +137,7 @@ class RepeatedMessageFieldGenerator : public FieldGenerator { |
const FieldDescriptor* descriptor_; |
const bool dependent_field_; |
const bool dependent_getter_; |
- std::map<string, string> variables_; |
+ map<string, string> variables_; |
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedMessageFieldGenerator); |
}; |