diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2018-06-06 09:41:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-06 09:41:26 -0700 |
| commit | 6ed0141c2e872dd5abbee2f9436ce7e65a1409b7 (patch) | |
| tree | ca05210736f5396f02f49d046b0e01ea54a10f3d /objectivec/GPBDescriptor.m | |
| parent | 7e199b9e3501c2a34eeb28fd7eecde46086ad65f (diff) | |
| parent | a3f31bf0e2b74a5b29cbde36ee0d45937f76fda6 (diff) | |
| download | protobuf-6ed0141c2e872dd5abbee2f9436ce7e65a1409b7.tar.gz protobuf-6ed0141c2e872dd5abbee2f9436ce7e65a1409b7.tar.bz2 protobuf-6ed0141c2e872dd5abbee2f9436ce7e65a1409b7.zip | |
Merge pull request #4730 from acozzette/xcode
Cherry-picked XCode 10 fixes into 3.6.x branch
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 615d2234..4b39c63b 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 { @@ -998,7 +998,7 @@ uint32_t GPBFieldAlternateTag(GPBFieldDescriptor *self) { } - (NSString *)singletonName { - return @(description_->singletonName); + return (NSString * _Nonnull)@(description_->singletonName); } - (const char *)singletonNameC { |