Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_field.cc |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_field.cc b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_field.cc |
index 4480a9d2d036ace5f7b6b64365090d26e61239ad..b3ba3a2e5ad340c6bc09194be695b0a0889ace5d 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_field.cc |
+++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_field.cc |
@@ -59,7 +59,7 @@ namespace cpp { |
using internal::WireFormat; |
void SetCommonFieldVariables(const FieldDescriptor* descriptor, |
- std::map<string, string>* variables, |
+ map<string, string>* variables, |
const Options& options) { |
(*variables)["name"] = FieldName(descriptor); |
(*variables)["index"] = SimpleItoa(descriptor->index()); |
@@ -78,7 +78,7 @@ void SetCommonFieldVariables(const FieldDescriptor* descriptor, |
(*variables)["deprecation"] = descriptor->options().deprecated() |
? " PROTOBUF_DEPRECATED" : ""; |
(*variables)["deprecated_attr"] = descriptor->options().deprecated() |
- ? "GOOGLE_PROTOBUF_DEPRECATED_ATTR " : ""; |
+ ? "PROTOBUF_DEPRECATED_ATTR " : ""; |
(*variables)["cppget"] = "Get"; |
@@ -98,7 +98,7 @@ void SetCommonFieldVariables(const FieldDescriptor* descriptor, |
} |
void SetCommonOneofFieldVariables(const FieldDescriptor* descriptor, |
- std::map<string, string>* variables) { |
+ map<string, string>* variables) { |
const string prefix = descriptor->containing_oneof()->name() + "_."; |
(*variables)["oneof_prefix"] = prefix; |
(*variables)["oneof_name"] = descriptor->containing_oneof()->name(); |