aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc
diff options
context:
space:
mode:
authorSergio Campamá <kaipi@google.com>2016-09-08 12:15:12 -0700
committerThomas Van Lenten <thomasvl@google.com>2016-09-08 15:15:12 -0400
commit14e74f6a21f2726d25e0e679c59d569f6bc8fe8e (patch)
treece8f08262113361b116c643a358e0fe2f49c5aa0 /src/google/protobuf/compiler/objectivec/objectivec_map_field.cc
parent4bc16578537495b5ee010d89f2909858312210ac (diff)
downloadprotobuf-14e74f6a21f2726d25e0e679c59d569f6bc8fe8e.tar.gz
protobuf-14e74f6a21f2726d25e0e679c59d569f6bc8fe8e.tar.bz2
protobuf-14e74f6a21f2726d25e0e679c59d569f6bc8fe8e.zip
Support the -Wassign-enum compiler flag. (#2085)
Support the -Wassign-enum compiler flag.
Diffstat (limited to 'src/google/protobuf/compiler/objectivec/objectivec_map_field.cc')
-rw-r--r--src/google/protobuf/compiler/objectivec/objectivec_map_field.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc b/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc
index ac5d8aea..0bc9dc10 100644
--- a/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc
+++ b/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc
@@ -115,7 +115,7 @@ MapFieldGenerator::MapFieldGenerator(const FieldDescriptor* descriptor,
if (value_field_flags.find("GPBFieldHasEnumDescriptor") != string::npos) {
field_flags.push_back("GPBFieldHasEnumDescriptor");
}
- variables_["fieldflags"] = BuildFlagsString(field_flags);
+ variables_["fieldflags"] = BuildFlagsString(FLAGTYPE_FIELD, field_flags);
ObjectiveCType value_objc_type = GetObjectiveCType(value_descriptor);
const bool value_is_object_type =