aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/compiler/objectivec/objectivec_message.cc
diff options
context:
space:
mode:
authorGravatar Sergio Campamá <kaipi@google.com>2016-09-08 12:15:12 -0700
committerGravatar Thomas Van Lenten <thomasvl@google.com>2016-09-08 15:15:12 -0400
commit14e74f6a21f2726d25e0e679c59d569f6bc8fe8e (patch)
treece8f08262113361b116c643a358e0fe2f49c5aa0 /src/google/protobuf/compiler/objectivec/objectivec_message.cc
parent4bc16578537495b5ee010d89f2909858312210ac (diff)
Support the -Wassign-enum compiler flag. (#2085)
Support the -Wassign-enum compiler flag.
Diffstat (limited to 'src/google/protobuf/compiler/objectivec/objectivec_message.cc')
-rw-r--r--src/google/protobuf/compiler/objectivec/objectivec_message.cc3
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 822da893..36537e43 100644
--- a/src/google/protobuf/compiler/objectivec/objectivec_message.cc
+++ b/src/google/protobuf/compiler/objectivec/objectivec_message.cc
@@ -521,7 +521,8 @@ void MessageGenerator::GenerateSource(io::Printer* printer) {
if (descriptor_->options().message_set_wire_format()) {
init_flags.push_back("GPBDescriptorInitializationFlag_WireFormat");
}
- vars["init_flags"] = BuildFlagsString(init_flags);
+ vars["init_flags"] = BuildFlagsString(FLAGTYPE_DESCRIPTOR_INITIALIZATION,
+ init_flags);
printer->Print(
vars,