diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2018-01-31 13:58:11 -0500 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2018-01-31 14:24:51 -0500 |
| commit | d83837ded558bc2fd2b61a5f51ed52e4606345aa (patch) | |
| tree | ab509f8a2938a9e6f1d6aaa68c2afe821c517da2 /objectivec | |
| parent | 81aeed082ecc35b62f1808234f4a0dd347775b33 (diff) | |
Fix to use "nil" instead of "NULL" for objc objects.
Diffstat (limited to 'objectivec')
| -rw-r--r-- | objectivec/google/protobuf/Struct.pbobjc.m | 2 | ||||
| -rw-r--r-- | objectivec/google/protobuf/Type.pbobjc.m | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/objectivec/google/protobuf/Struct.pbobjc.m b/objectivec/google/protobuf/Struct.pbobjc.m index 6d9d7b75..816fd6df 100644 --- a/objectivec/google/protobuf/Struct.pbobjc.m +++ b/objectivec/google/protobuf/Struct.pbobjc.m @@ -53,7 +53,7 @@ static GPBFileDescriptor *GPBStructRoot_FileDescriptor(void) { #pragma mark - Enum GPBNullValue GPBEnumDescriptor *GPBNullValue_EnumDescriptor(void) { - static _Atomic(GPBEnumDescriptor*) descriptor = NULL; + static _Atomic(GPBEnumDescriptor*) descriptor = nil; if (!descriptor) { static const char *valueNames = "NullValue\000"; diff --git a/objectivec/google/protobuf/Type.pbobjc.m b/objectivec/google/protobuf/Type.pbobjc.m index 981ae4d4..bb64d876 100644 --- a/objectivec/google/protobuf/Type.pbobjc.m +++ b/objectivec/google/protobuf/Type.pbobjc.m @@ -56,7 +56,7 @@ static GPBFileDescriptor *GPBTypeRoot_FileDescriptor(void) { #pragma mark - Enum GPBSyntax GPBEnumDescriptor *GPBSyntax_EnumDescriptor(void) { - static _Atomic(GPBEnumDescriptor*) descriptor = NULL; + static _Atomic(GPBEnumDescriptor*) descriptor = nil; if (!descriptor) { static const char *valueNames = "SyntaxProto2\000SyntaxProto3\000"; @@ -371,7 +371,7 @@ void SetGPBField_Cardinality_RawValue(GPBField *message, int32_t value) { #pragma mark - Enum GPBField_Kind GPBEnumDescriptor *GPBField_Kind_EnumDescriptor(void) { - static _Atomic(GPBEnumDescriptor*) descriptor = NULL; + static _Atomic(GPBEnumDescriptor*) descriptor = nil; if (!descriptor) { static const char *valueNames = "TypeUnknown\000TypeDouble\000TypeFloat\000TypeInt" @@ -445,7 +445,7 @@ BOOL GPBField_Kind_IsValidValue(int32_t value__) { #pragma mark - Enum GPBField_Cardinality GPBEnumDescriptor *GPBField_Cardinality_EnumDescriptor(void) { - static _Atomic(GPBEnumDescriptor*) descriptor = NULL; + static _Atomic(GPBEnumDescriptor*) descriptor = nil; if (!descriptor) { static const char *valueNames = "CardinalityUnknown\000CardinalityOptional\000C" |