| 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 b3ba3a2e5ad340c6bc09194be695b0a0889ace5d..e2033c1acdc0271b627373745a3a8139fdc25b50 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
|
| @@ -78,7 +78,7 @@ void SetCommonFieldVariables(const FieldDescriptor* descriptor,
|
| (*variables)["deprecation"] = descriptor->options().deprecated()
|
| ? " PROTOBUF_DEPRECATED" : "";
|
| (*variables)["deprecated_attr"] = descriptor->options().deprecated()
|
| - ? "PROTOBUF_DEPRECATED_ATTR " : "";
|
| + ? "GOOGLE_PROTOBUF_DEPRECATED_ATTR " : "";
|
|
|
| (*variables)["cppget"] = "Get";
|
|
|
|
|