diff options
| author |  Bo Yang <teboring@google.com> | 2016-06-07 16:36:13 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2016-06-07 16:36:13 -0700 |
| commit | 401e07d3726e91659228dff8ed9f7cb02026c47e (patch) | |
| tree | 6c52433e5ff5237c766f3e0a5085b159a1defbee /src | |
| parent | b60e615cba2131490c4b42d2b03de057407226d1 (diff) | |
Add GOOGLE_ prefix before PROTOBUF_DEPRECATED_ATTR
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_enum.cc | 2 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_field.cc | 2 | ||||
| -rw-r--r-- | src/google/protobuf/generated_message_util.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_enum.cc b/src/google/protobuf/compiler/cpp/cpp_enum.cc index c81c5982..62b7ed4e 100644 --- a/src/google/protobuf/compiler/cpp/cpp_enum.cc +++ b/src/google/protobuf/compiler/cpp/cpp_enum.cc @@ -189,7 +189,7 @@ void EnumGenerator::GenerateSymbolImports(io::Printer* printer) { for (int j = 0; j < descriptor_->value_count(); j++) { vars["tag"] = EnumValueName(descriptor_->value(j)); vars["deprecated_attr"] = descriptor_->value(j)->options().deprecated() ? - "PROTOBUF_DEPRECATED_ATTR " : ""; + "GOOGLE_PROTOBUF_DEPRECATED_ATTR " : ""; printer->Print(vars, "$deprecated_attr$static $constexpr$const $nested_name$ $tag$ =\n" " $classname$_$tag$;\n"); diff --git a/src/google/protobuf/compiler/cpp/cpp_field.cc b/src/google/protobuf/compiler/cpp/cpp_field.cc index b3ba3a2e..e2033c1a 100644 --- a/src/google/protobuf/compiler/cpp/cpp_field.cc +++ b/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"; diff --git a/src/google/protobuf/generated_message_util.h b/src/google/protobuf/generated_message_util.h index 4475556a..56f5afd2 100644 --- a/src/google/protobuf/generated_message_util.h +++ b/src/google/protobuf/generated_message_util.h @@ -63,7 +63,7 @@ namespace internal { #undef DEPRECATED_PROTOBUF_FIELD #define PROTOBUF_DEPRECATED -#define PROTOBUF_DEPRECATED_ATTR +#define GOOGLE_PROTOBUF_DEPRECATED_ATTR // Constants for special floating point values. |