AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Add GOOGLE_ prefix before PROTOBUF_DEPRECATED_ATTR

Browse Source
This commit is contained in:
Bo Yang 2016-06-07 16:36:13 -07:00
parent b60e615cba
commit 401e07d372
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/google/protobuf/compiler/cpp/cpp_enum.cc
View File

@ -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");

2
src/google/protobuf/compiler/cpp/cpp_field.cc
View File

@ -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";

2
src/google/protobuf/generated_message_util.h
View File

@ -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.