diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2015-11-30 14:38:04 -0500 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2016-02-18 13:55:59 -0500 |
commit | 2480acb6d974a2cfc1da5b1ea8cc14f2415e6dfe (patch) | |
tree | 3e95be3eae1e7d0ff8dce89951b167843127fb94 /objectivec/google | |
parent | 9ab11c6561abd5fe997a999f21799d160b0d14cf (diff) | |
download | protobuf-2480acb6d974a2cfc1da5b1ea8cc14f2415e6dfe.tar.gz protobuf-2480acb6d974a2cfc1da5b1ea8cc14f2415e6dfe.tar.bz2 protobuf-2480acb6d974a2cfc1da5b1ea8cc14f2415e6dfe.zip |
Support ObjC Generic Collections
- Extend GPB*ObjectDictionary to support generic syntax.
- Update the generator to output generics so the enclosed type is exposed for compiler checks.
- Use generics in a the public interfaces.
- Update the generated sources that are checked in.
Diffstat (limited to 'objectivec/google')
-rw-r--r-- | objectivec/google/protobuf/Api.pbobjc.h | 15 | ||||
-rw-r--r-- | objectivec/google/protobuf/Descriptor.pbobjc.h | 95 | ||||
-rw-r--r-- | objectivec/google/protobuf/FieldMask.pbobjc.h | 3 | ||||
-rw-r--r-- | objectivec/google/protobuf/Struct.pbobjc.h | 7 | ||||
-rw-r--r-- | objectivec/google/protobuf/Type.pbobjc.h | 24 |
5 files changed, 62 insertions, 82 deletions
diff --git a/objectivec/google/protobuf/Api.pbobjc.h b/objectivec/google/protobuf/Api.pbobjc.h index c3cf8e94..8d82b15f 100644 --- a/objectivec/google/protobuf/Api.pbobjc.h +++ b/objectivec/google/protobuf/Api.pbobjc.h @@ -11,6 +11,9 @@ CF_EXTERN_C_BEGIN +@class GPBMethod; +@class GPBMixin; +@class GPBOption; @class GPBSourceContext; GPB_ENUM_FWD_DECLARE(GPBSyntax); @@ -47,13 +50,11 @@ typedef GPB_ENUM(GPBApi_FieldNumber) { @property(nonatomic, readwrite, copy, null_resettable) NSString *name; // The methods of this api, in unspecified order. -// |methodsArray| contains |GPBMethod| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *methodsArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBMethod*> *methodsArray; @property(nonatomic, readonly) NSUInteger methodsArray_Count; // Any metadata attached to the API. -// |optionsArray| contains |GPBOption| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *optionsArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBOption*> *optionsArray; @property(nonatomic, readonly) NSUInteger optionsArray_Count; // A version string for this api. If specified, must have the form @@ -84,8 +85,7 @@ typedef GPB_ENUM(GPBApi_FieldNumber) { @property(nonatomic, readwrite, strong, null_resettable) GPBSourceContext *sourceContext; // Included APIs. See [Mixin][]. -// |mixinsArray| contains |GPBMixin| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *mixinsArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBMixin*> *mixinsArray; @property(nonatomic, readonly) NSUInteger mixinsArray_Count; // The source syntax of the service. @@ -127,8 +127,7 @@ typedef GPB_ENUM(GPBMethod_FieldNumber) { @property(nonatomic, readwrite) BOOL responseStreaming; // Any metadata attached to the method. -// |optionsArray| contains |GPBOption| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *optionsArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBOption*> *optionsArray; @property(nonatomic, readonly) NSUInteger optionsArray_Count; // The source syntax of this method. diff --git a/objectivec/google/protobuf/Descriptor.pbobjc.h b/objectivec/google/protobuf/Descriptor.pbobjc.h index 9c43cfd2..2ab20243 100644 --- a/objectivec/google/protobuf/Descriptor.pbobjc.h +++ b/objectivec/google/protobuf/Descriptor.pbobjc.h @@ -11,14 +11,28 @@ CF_EXTERN_C_BEGIN +@class GPBDescriptorProto; +@class GPBDescriptorProto_ExtensionRange; +@class GPBDescriptorProto_ReservedRange; +@class GPBEnumDescriptorProto; @class GPBEnumOptions; +@class GPBEnumValueDescriptorProto; @class GPBEnumValueOptions; +@class GPBFieldDescriptorProto; @class GPBFieldOptions; +@class GPBFileDescriptorProto; @class GPBFileOptions; +@class GPBGeneratedCodeInfo_Annotation; @class GPBMessageOptions; +@class GPBMethodDescriptorProto; @class GPBMethodOptions; +@class GPBOneofDescriptorProto; +@class GPBServiceDescriptorProto; @class GPBServiceOptions; @class GPBSourceCodeInfo; +@class GPBSourceCodeInfo_Location; +@class GPBUninterpretedOption; +@class GPBUninterpretedOption_NamePart; NS_ASSUME_NONNULL_BEGIN @@ -151,8 +165,7 @@ typedef GPB_ENUM(GPBFileDescriptorSet_FieldNumber) { // files it parses. @interface GPBFileDescriptorSet : GPBMessage -// |fileArray| contains |GPBFileDescriptorProto| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *fileArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBFileDescriptorProto*> *fileArray; @property(nonatomic, readonly) NSUInteger fileArray_Count; @end @@ -186,8 +199,7 @@ typedef GPB_ENUM(GPBFileDescriptorProto_FieldNumber) { @property(nonatomic, readwrite, copy, null_resettable) NSString *package; // Names of files imported by this file. -// |dependencyArray| contains |NSString| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *dependencyArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<NSString*> *dependencyArray; @property(nonatomic, readonly) NSUInteger dependencyArray_Count; // Indexes of the public imported files in the dependency list above. @@ -200,20 +212,16 @@ typedef GPB_ENUM(GPBFileDescriptorProto_FieldNumber) { @property(nonatomic, readonly) NSUInteger weakDependencyArray_Count; // All top-level definitions in this file. -// |messageTypeArray| contains |GPBDescriptorProto| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *messageTypeArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBDescriptorProto*> *messageTypeArray; @property(nonatomic, readonly) NSUInteger messageTypeArray_Count; -// |enumTypeArray| contains |GPBEnumDescriptorProto| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *enumTypeArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBEnumDescriptorProto*> *enumTypeArray; @property(nonatomic, readonly) NSUInteger enumTypeArray_Count; -// |serviceArray| contains |GPBServiceDescriptorProto| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *serviceArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBServiceDescriptorProto*> *serviceArray; @property(nonatomic, readonly) NSUInteger serviceArray_Count; -// |extensionArray| contains |GPBFieldDescriptorProto| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *extensionArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBFieldDescriptorProto*> *extensionArray; @property(nonatomic, readonly) NSUInteger extensionArray_Count; @property(nonatomic, readwrite) BOOL hasOptions; @@ -254,41 +262,33 @@ typedef GPB_ENUM(GPBDescriptorProto_FieldNumber) { @property(nonatomic, readwrite) BOOL hasName; @property(nonatomic, readwrite, copy, null_resettable) NSString *name; -// |fieldArray| contains |GPBFieldDescriptorProto| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *fieldArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBFieldDescriptorProto*> *fieldArray; @property(nonatomic, readonly) NSUInteger fieldArray_Count; -// |extensionArray| contains |GPBFieldDescriptorProto| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *extensionArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBFieldDescriptorProto*> *extensionArray; @property(nonatomic, readonly) NSUInteger extensionArray_Count; -// |nestedTypeArray| contains |GPBDescriptorProto| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *nestedTypeArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBDescriptorProto*> *nestedTypeArray; @property(nonatomic, readonly) NSUInteger nestedTypeArray_Count; -// |enumTypeArray| contains |GPBEnumDescriptorProto| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *enumTypeArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBEnumDescriptorProto*> *enumTypeArray; @property(nonatomic, readonly) NSUInteger enumTypeArray_Count; -// |extensionRangeArray| contains |GPBDescriptorProto_ExtensionRange| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *extensionRangeArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBDescriptorProto_ExtensionRange*> *extensionRangeArray; @property(nonatomic, readonly) NSUInteger extensionRangeArray_Count; -// |oneofDeclArray| contains |GPBOneofDescriptorProto| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *oneofDeclArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBOneofDescriptorProto*> *oneofDeclArray; @property(nonatomic, readonly) NSUInteger oneofDeclArray_Count; @property(nonatomic, readwrite) BOOL hasOptions; @property(nonatomic, readwrite, strong, null_resettable) GPBMessageOptions *options; -// |reservedRangeArray| contains |GPBDescriptorProto_ReservedRange| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *reservedRangeArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBDescriptorProto_ReservedRange*> *reservedRangeArray; @property(nonatomic, readonly) NSUInteger reservedRangeArray_Count; // Reserved field names, which may not be used by fields in the same message. // A given name may only be reserved once. -// |reservedNameArray| contains |NSString| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *reservedNameArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<NSString*> *reservedNameArray; @property(nonatomic, readonly) NSUInteger reservedNameArray_Count; @end @@ -430,8 +430,7 @@ typedef GPB_ENUM(GPBEnumDescriptorProto_FieldNumber) { @property(nonatomic, readwrite) BOOL hasName; @property(nonatomic, readwrite, copy, null_resettable) NSString *name; -// |valueArray| contains |GPBEnumValueDescriptorProto| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *valueArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBEnumValueDescriptorProto*> *valueArray; @property(nonatomic, readonly) NSUInteger valueArray_Count; @property(nonatomic, readwrite) BOOL hasOptions; @@ -475,8 +474,7 @@ typedef GPB_ENUM(GPBServiceDescriptorProto_FieldNumber) { @property(nonatomic, readwrite) BOOL hasName; @property(nonatomic, readwrite, copy, null_resettable) NSString *name; -// |methodArray| contains |GPBMethodDescriptorProto| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *methodArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBMethodDescriptorProto*> *methodArray; @property(nonatomic, readonly) NSUInteger methodArray_Count; @property(nonatomic, readwrite) BOOL hasOptions; @@ -650,8 +648,7 @@ typedef GPB_ENUM(GPBFileOptions_FieldNumber) { @property(nonatomic, readwrite) BOOL javananoUseDeprecatedPackage; // The parser stores options it doesn't recognize here. See above. -// |uninterpretedOptionArray| contains |GPBUninterpretedOption| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *uninterpretedOptionArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBUninterpretedOption*> *uninterpretedOptionArray; @property(nonatomic, readonly) NSUInteger uninterpretedOptionArray_Count; @end @@ -727,8 +724,7 @@ typedef GPB_ENUM(GPBMessageOptions_FieldNumber) { @property(nonatomic, readwrite) BOOL mapEntry; // The parser stores options it doesn't recognize here. See above. -// |uninterpretedOptionArray| contains |GPBUninterpretedOption| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *uninterpretedOptionArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBUninterpretedOption*> *uninterpretedOptionArray; @property(nonatomic, readonly) NSUInteger uninterpretedOptionArray_Count; @end @@ -817,8 +813,7 @@ typedef GPB_ENUM(GPBFieldOptions_FieldNumber) { @property(nonatomic, readwrite) BOOL weak; // The parser stores options it doesn't recognize here. See above. -// |uninterpretedOptionArray| contains |GPBUninterpretedOption| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *uninterpretedOptionArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBUninterpretedOption*> *uninterpretedOptionArray; @property(nonatomic, readonly) NSUInteger uninterpretedOptionArray_Count; @end @@ -846,8 +841,7 @@ typedef GPB_ENUM(GPBEnumOptions_FieldNumber) { @property(nonatomic, readwrite) BOOL deprecated; // The parser stores options it doesn't recognize here. See above. -// |uninterpretedOptionArray| contains |GPBUninterpretedOption| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *uninterpretedOptionArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBUninterpretedOption*> *uninterpretedOptionArray; @property(nonatomic, readonly) NSUInteger uninterpretedOptionArray_Count; @end @@ -869,8 +863,7 @@ typedef GPB_ENUM(GPBEnumValueOptions_FieldNumber) { @property(nonatomic, readwrite) BOOL deprecated; // The parser stores options it doesn't recognize here. See above. -// |uninterpretedOptionArray| contains |GPBUninterpretedOption| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *uninterpretedOptionArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBUninterpretedOption*> *uninterpretedOptionArray; @property(nonatomic, readonly) NSUInteger uninterpretedOptionArray_Count; @end @@ -892,8 +885,7 @@ typedef GPB_ENUM(GPBServiceOptions_FieldNumber) { @property(nonatomic, readwrite) BOOL deprecated; // The parser stores options it doesn't recognize here. See above. -// |uninterpretedOptionArray| contains |GPBUninterpretedOption| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *uninterpretedOptionArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBUninterpretedOption*> *uninterpretedOptionArray; @property(nonatomic, readonly) NSUInteger uninterpretedOptionArray_Count; @end @@ -915,8 +907,7 @@ typedef GPB_ENUM(GPBMethodOptions_FieldNumber) { @property(nonatomic, readwrite) BOOL deprecated; // The parser stores options it doesn't recognize here. See above. -// |uninterpretedOptionArray| contains |GPBUninterpretedOption| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *uninterpretedOptionArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBUninterpretedOption*> *uninterpretedOptionArray; @property(nonatomic, readonly) NSUInteger uninterpretedOptionArray_Count; @end @@ -941,8 +932,7 @@ typedef GPB_ENUM(GPBUninterpretedOption_FieldNumber) { // in them. @interface GPBUninterpretedOption : GPBMessage -// |nameArray| contains |GPBUninterpretedOption_NamePart| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *nameArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBUninterpretedOption_NamePart*> *nameArray; @property(nonatomic, readonly) NSUInteger nameArray_Count; // The value of the uninterpreted option, in whatever type the tokenizer @@ -1042,8 +1032,7 @@ typedef GPB_ENUM(GPBSourceCodeInfo_FieldNumber) { // - Code which tries to interpret locations should probably be designed to // ignore those that it doesn't understand, as more types of locations could // be recorded in the future. -// |locationArray| contains |GPBSourceCodeInfo_Location| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *locationArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBSourceCodeInfo_Location*> *locationArray; @property(nonatomic, readonly) NSUInteger locationArray_Count; @end @@ -1147,8 +1136,7 @@ typedef GPB_ENUM(GPBSourceCodeInfo_Location_FieldNumber) { @property(nonatomic, readwrite) BOOL hasTrailingComments; @property(nonatomic, readwrite, copy, null_resettable) NSString *trailingComments; -// |leadingDetachedCommentsArray| contains |NSString| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *leadingDetachedCommentsArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<NSString*> *leadingDetachedCommentsArray; @property(nonatomic, readonly) NSUInteger leadingDetachedCommentsArray_Count; @end @@ -1166,8 +1154,7 @@ typedef GPB_ENUM(GPBGeneratedCodeInfo_FieldNumber) { // An Annotation connects some span of text in generated code to an element // of its generating .proto file. -// |annotationArray| contains |GPBGeneratedCodeInfo_Annotation| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *annotationArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBGeneratedCodeInfo_Annotation*> *annotationArray; @property(nonatomic, readonly) NSUInteger annotationArray_Count; @end diff --git a/objectivec/google/protobuf/FieldMask.pbobjc.h b/objectivec/google/protobuf/FieldMask.pbobjc.h index 4e4ec387..f4bc2653 100644 --- a/objectivec/google/protobuf/FieldMask.pbobjc.h +++ b/objectivec/google/protobuf/FieldMask.pbobjc.h @@ -155,8 +155,7 @@ typedef GPB_ENUM(GPBFieldMask_FieldNumber) { @interface GPBFieldMask : GPBMessage // The set of field mask paths. -// |pathsArray| contains |NSString| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *pathsArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<NSString*> *pathsArray; @property(nonatomic, readonly) NSUInteger pathsArray_Count; @end diff --git a/objectivec/google/protobuf/Struct.pbobjc.h b/objectivec/google/protobuf/Struct.pbobjc.h index f40414fa..293dea40 100644 --- a/objectivec/google/protobuf/Struct.pbobjc.h +++ b/objectivec/google/protobuf/Struct.pbobjc.h @@ -13,6 +13,7 @@ CF_EXTERN_C_BEGIN @class GPBListValue; @class GPBStruct; +@class GPBValue; NS_ASSUME_NONNULL_BEGIN @@ -60,8 +61,7 @@ typedef GPB_ENUM(GPBStruct_FieldNumber) { @interface GPBStruct : GPBMessage // Map of dynamically typed values. -// |fields| values are |GPBValue| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableDictionary *fields; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableDictionary<NSString*, GPBValue*> *fields; @property(nonatomic, readonly) NSUInteger fields_Count; @end @@ -135,8 +135,7 @@ typedef GPB_ENUM(GPBListValue_FieldNumber) { @interface GPBListValue : GPBMessage // Repeated field of dynamically typed values. -// |valuesArray| contains |GPBValue| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *valuesArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBValue*> *valuesArray; @property(nonatomic, readonly) NSUInteger valuesArray_Count; @end diff --git a/objectivec/google/protobuf/Type.pbobjc.h b/objectivec/google/protobuf/Type.pbobjc.h index e4c7a251..a7d03a2a 100644 --- a/objectivec/google/protobuf/Type.pbobjc.h +++ b/objectivec/google/protobuf/Type.pbobjc.h @@ -12,6 +12,9 @@ CF_EXTERN_C_BEGIN @class GPBAny; +@class GPBEnumValue; +@class GPBField; +@class GPBOption; @class GPBSourceContext; NS_ASSUME_NONNULL_BEGIN @@ -150,18 +153,15 @@ typedef GPB_ENUM(GPBType_FieldNumber) { @property(nonatomic, readwrite, copy, null_resettable) NSString *name; // The list of fields. -// |fieldsArray| contains |GPBField| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *fieldsArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBField*> *fieldsArray; @property(nonatomic, readonly) NSUInteger fieldsArray_Count; // The list of types appearing in `oneof` definitions in this type. -// |oneofsArray| contains |NSString| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *oneofsArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<NSString*> *oneofsArray; @property(nonatomic, readonly) NSUInteger oneofsArray_Count; // The protocol buffer options. -// |optionsArray| contains |GPBOption| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *optionsArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBOption*> *optionsArray; @property(nonatomic, readonly) NSUInteger optionsArray_Count; // The source context. @@ -218,8 +218,7 @@ typedef GPB_ENUM(GPBField_FieldNumber) { @property(nonatomic, readwrite) BOOL packed; // The protocol buffer options. -// |optionsArray| contains |GPBOption| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *optionsArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBOption*> *optionsArray; @property(nonatomic, readonly) NSUInteger optionsArray_Count; // The field JSON name. @@ -253,13 +252,11 @@ typedef GPB_ENUM(GPBEnum_FieldNumber) { @property(nonatomic, readwrite, copy, null_resettable) NSString *name; // Enum value definitions. -// |enumvalueArray| contains |GPBEnumValue| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *enumvalueArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBEnumValue*> *enumvalueArray; @property(nonatomic, readonly) NSUInteger enumvalueArray_Count; // Protocol buffer options. -// |optionsArray| contains |GPBOption| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *optionsArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBOption*> *optionsArray; @property(nonatomic, readonly) NSUInteger optionsArray_Count; // The source context. @@ -292,8 +289,7 @@ typedef GPB_ENUM(GPBEnumValue_FieldNumber) { @property(nonatomic, readwrite) int32_t number; // Protocol buffer options. -// |optionsArray| contains |GPBOption| -@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray *optionsArray; +@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBOption*> *optionsArray; @property(nonatomic, readonly) NSUInteger optionsArray_Count; @end |