From 2480acb6d974a2cfc1da5b1ea8cc14f2415e6dfe Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Mon, 30 Nov 2015 14:38:04 -0500 Subject: 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. --- objectivec/GPBDescriptor.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'objectivec/GPBDescriptor.h') diff --git a/objectivec/GPBDescriptor.h b/objectivec/GPBDescriptor.h index 360afe96..8d8e9754 100644 --- a/objectivec/GPBDescriptor.h +++ b/objectivec/GPBDescriptor.h @@ -55,9 +55,9 @@ typedef NS_ENUM(NSInteger, GPBFieldType) { @interface GPBDescriptor : NSObject @property(nonatomic, readonly, copy) NSString *name; -@property(nonatomic, readonly, strong, nullable) NSArray *fields; -@property(nonatomic, readonly, strong, nullable) NSArray *oneofs; -@property(nonatomic, readonly, strong, nullable) NSArray *enums; +@property(nonatomic, readonly, strong, nullable) NSArray *fields; +@property(nonatomic, readonly, strong, nullable) NSArray *oneofs; +@property(nonatomic, readonly, strong, nullable) NSArray *enums; @property(nonatomic, readonly, nullable) const GPBExtensionRange *extensionRanges; @property(nonatomic, readonly) NSUInteger extensionRangesCount; @property(nonatomic, readonly, assign) GPBFileDescriptor *file; @@ -81,7 +81,7 @@ typedef NS_ENUM(NSInteger, GPBFieldType) { @interface GPBOneofDescriptor : NSObject @property(nonatomic, readonly) NSString *name; -@property(nonatomic, readonly) NSArray *fields; +@property(nonatomic, readonly) NSArray *fields; - (nullable GPBFieldDescriptor *)fieldWithNumber:(uint32_t)fieldNumber; - (nullable GPBFieldDescriptor *)fieldWithName:(NSString *)name; -- cgit v1.2.3