diff options
| author |  Sergio Campamá <kaipi@google.com> | 2016-09-08 12:15:12 -0700 |
|---|---|---|
| committer |  Thomas Van Lenten <thomasvl@google.com> | 2016-09-08 15:15:12 -0400 |
| commit | 14e74f6a21f2726d25e0e679c59d569f6bc8fe8e (patch) | |
| tree | ce8f08262113361b116c643a358e0fe2f49c5aa0 /src/google/protobuf/compiler/objectivec/objectivec_helpers.h | |
| parent | 4bc16578537495b5ee010d89f2909858312210ac (diff) | |
Support the -Wassign-enum compiler flag. (#2085)
Support the -Wassign-enum compiler flag.
Diffstat (limited to 'src/google/protobuf/compiler/objectivec/objectivec_helpers.h')
| -rw-r--r-- | src/google/protobuf/compiler/objectivec/objectivec_helpers.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h index b05983df..8f8f1d90 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h +++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h @@ -137,6 +137,12 @@ enum ObjectiveCType { OBJECTIVECTYPE_MESSAGE }; +enum FlagType { + FLAGTYPE_DESCRIPTOR_INITIALIZATION, + FLAGTYPE_EXTENSION, + FLAGTYPE_FIELD +}; + template<class TDescriptor> string GetOptionalDeprecatedAttribute(const TDescriptor* descriptor, bool preSpace = true, bool postNewline = false) { if (descriptor->options().deprecated()) { @@ -168,7 +174,7 @@ string GPBGenericValueFieldName(const FieldDescriptor* field); string DefaultValue(const FieldDescriptor* field); bool HasNonZeroDefaultValue(const FieldDescriptor* field); -string BuildFlagsString(const vector<string>& strings); +string BuildFlagsString(const FlagType type, const vector<string>& strings); // Builds HeaderDoc/appledoc style comments out of the comments in the .proto // file. |