Explorar el Código

Fix to use "nil" instead of "NULL" for objc objects.

Thomas Van Lenten hace 7 años
padre
commit
d83837ded5

+ 1 - 1
objectivec/google/protobuf/Struct.pbobjc.m

@@ -53,7 +53,7 @@ static GPBFileDescriptor *GPBStructRoot_FileDescriptor(void) {
 #pragma mark - Enum GPBNullValue
 #pragma mark - Enum GPBNullValue
 
 
 GPBEnumDescriptor *GPBNullValue_EnumDescriptor(void) {
 GPBEnumDescriptor *GPBNullValue_EnumDescriptor(void) {
-  static _Atomic(GPBEnumDescriptor*) descriptor = NULL;
+  static _Atomic(GPBEnumDescriptor*) descriptor = nil;
   if (!descriptor) {
   if (!descriptor) {
     static const char *valueNames =
     static const char *valueNames =
         "NullValue\000";
         "NullValue\000";

+ 3 - 3
objectivec/google/protobuf/Type.pbobjc.m

@@ -56,7 +56,7 @@ static GPBFileDescriptor *GPBTypeRoot_FileDescriptor(void) {
 #pragma mark - Enum GPBSyntax
 #pragma mark - Enum GPBSyntax
 
 
 GPBEnumDescriptor *GPBSyntax_EnumDescriptor(void) {
 GPBEnumDescriptor *GPBSyntax_EnumDescriptor(void) {
-  static _Atomic(GPBEnumDescriptor*) descriptor = NULL;
+  static _Atomic(GPBEnumDescriptor*) descriptor = nil;
   if (!descriptor) {
   if (!descriptor) {
     static const char *valueNames =
     static const char *valueNames =
         "SyntaxProto2\000SyntaxProto3\000";
         "SyntaxProto2\000SyntaxProto3\000";
@@ -371,7 +371,7 @@ void SetGPBField_Cardinality_RawValue(GPBField *message, int32_t value) {
 #pragma mark - Enum GPBField_Kind
 #pragma mark - Enum GPBField_Kind
 
 
 GPBEnumDescriptor *GPBField_Kind_EnumDescriptor(void) {
 GPBEnumDescriptor *GPBField_Kind_EnumDescriptor(void) {
-  static _Atomic(GPBEnumDescriptor*) descriptor = NULL;
+  static _Atomic(GPBEnumDescriptor*) descriptor = nil;
   if (!descriptor) {
   if (!descriptor) {
     static const char *valueNames =
     static const char *valueNames =
         "TypeUnknown\000TypeDouble\000TypeFloat\000TypeInt"
         "TypeUnknown\000TypeDouble\000TypeFloat\000TypeInt"
@@ -445,7 +445,7 @@ BOOL GPBField_Kind_IsValidValue(int32_t value__) {
 #pragma mark - Enum GPBField_Cardinality
 #pragma mark - Enum GPBField_Cardinality
 
 
 GPBEnumDescriptor *GPBField_Cardinality_EnumDescriptor(void) {
 GPBEnumDescriptor *GPBField_Cardinality_EnumDescriptor(void) {
-  static _Atomic(GPBEnumDescriptor*) descriptor = NULL;
+  static _Atomic(GPBEnumDescriptor*) descriptor = nil;
   if (!descriptor) {
   if (!descriptor) {
     static const char *valueNames =
     static const char *valueNames =
         "CardinalityUnknown\000CardinalityOptional\000C"
         "CardinalityUnknown\000CardinalityOptional\000C"

+ 1 - 1
src/google/protobuf/compiler/objectivec/objectivec_enum.cc

@@ -149,7 +149,7 @@ void EnumGenerator::GenerateSource(io::Printer* printer) {
 
 
   printer->Print(
   printer->Print(
       "GPBEnumDescriptor *$name$_EnumDescriptor(void) {\n"
       "GPBEnumDescriptor *$name$_EnumDescriptor(void) {\n"
-      "  static _Atomic(GPBEnumDescriptor*) descriptor = NULL;\n"
+      "  static _Atomic(GPBEnumDescriptor*) descriptor = nil;\n"
       "  if (!descriptor) {\n",
       "  if (!descriptor) {\n",
       "name", name_);
       "name", name_);