diff options
| author |  Josh Haberman <jhaberman@gmail.com> | 2016-04-07 14:10:19 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-04-07 14:10:19 -0700 |
| commit | 4465daa57a4b6910965e9d078ae125ddb9ee8c21 (patch) | |
| tree | e6d5096e6a2a5523d2b1975f6248cd9d8f8957ce /src/google/protobuf/compiler/objectivec/objectivec_message.cc | |
| parent | 15239361e31d53c10b918aa9fe8ce057155588b4 (diff) | |
| parent | 09292d5759cbf3e82dcfae67e01ee31ed8906b5a (diff) | |
Merge branch 'master' into internal-merge
Diffstat (limited to 'src/google/protobuf/compiler/objectivec/objectivec_message.cc')
| -rw-r--r-- | src/google/protobuf/compiler/objectivec/objectivec_message.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_message.cc b/src/google/protobuf/compiler/objectivec/objectivec_message.cc index 3ebeeade..bf272596 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_message.cc +++ b/src/google/protobuf/compiler/objectivec/objectivec_message.cc @@ -321,8 +321,9 @@ void MessageGenerator::GenerateMessageHeader(io::Printer* printer) { } printer->Print( - "$comments$@interface $classname$ : GPBMessage\n\n", + "$comments$$deprecated_attribute$@interface $classname$ : GPBMessage\n\n", "classname", class_name_, + "deprecated_attribute", GetOptionalDeprecatedAttribute(descriptor_, false, true), "comments", message_comments); vector<char> seen_oneofs(descriptor_->oneof_decl_count(), 0); |