diff options
author | Sergio Campamá <kaipi@google.com> | 2018-06-05 15:14:19 -0400 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2018-06-05 15:14:19 -0400 |
commit | 6933e2f499b8c2b3a318cc4dbceb83b88ab39b0e (patch) | |
tree | 4d8a9bb9fdb9a6a8721732c076aa09a975177fba /objectivec/GPBDescriptor.m | |
parent | a4d16ed886068c68dd84eeb2fc441a7435f515ab (diff) | |
download | protobuf-6933e2f499b8c2b3a318cc4dbceb83b88ab39b0e.tar.gz protobuf-6933e2f499b8c2b3a318cc4dbceb83b88ab39b0e.tar.bz2 protobuf-6933e2f499b8c2b3a318cc4dbceb83b88ab39b0e.zip |
Update code to work for Xcode 10b1 (#4729)
* Update code to work for Xcode 10b
* Update README and test scripts to mention that Xcode 7 is no longer supported
Diffstat (limited to 'objectivec/GPBDescriptor.m')
-rw-r--r-- | objectivec/GPBDescriptor.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/objectivec/GPBDescriptor.m b/objectivec/GPBDescriptor.m index 83cbce07..ad46ef4f 100644 --- a/objectivec/GPBDescriptor.m +++ b/objectivec/GPBDescriptor.m @@ -411,7 +411,7 @@ static NSArray *NewFieldsArrayForHasIndex(int hasIndex, } - (NSString *)name { - return @(name_); + return (NSString * _Nonnull)@(name_); } - (GPBFieldDescriptor *)fieldWithNumber:(uint32_t)fieldNumber { @@ -582,7 +582,7 @@ uint32_t GPBFieldAlternateTag(GPBFieldDescriptor *self) { } - (NSString *)name { - return @(description_->name); + return (NSString * _Nonnull)@(description_->name); } - (BOOL)isRequired { @@ -1015,7 +1015,7 @@ uint32_t GPBFieldAlternateTag(GPBFieldDescriptor *self) { } - (NSString *)singletonName { - return @(description_->singletonName); + return (NSString * _Nonnull)@(description_->singletonName); } - (const char *)singletonNameC { |