Index: third_party/protobuf/objectivec/google/protobuf/Api.pbobjc.m |
diff --git a/third_party/protobuf/objectivec/google/protobuf/Api.pbobjc.m b/third_party/protobuf/objectivec/google/protobuf/Api.pbobjc.m |
index 58b47157def595062d9a114116b4e751a1735f4f..45a06e6009c11043565f3cf4801c8876459cbf0b 100644 |
--- a/third_party/protobuf/objectivec/google/protobuf/Api.pbobjc.m |
+++ b/third_party/protobuf/objectivec/google/protobuf/Api.pbobjc.m |
@@ -1,27 +1,10 @@ |
// Generated by the protocol buffer compiler. DO NOT EDIT! |
// source: google/protobuf/api.proto |
-// This CPP symbol can be defined to use imports that match up to the framework |
-// imports needed when using CocoaPods. |
-#if !defined(GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS) |
- #define GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS 0 |
-#endif |
- |
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS |
- #import <Protobuf/GPBProtocolBuffers_RuntimeSupport.h> |
-#else |
- #import "GPBProtocolBuffers_RuntimeSupport.h" |
-#endif |
- |
-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS |
- #import <Protobuf/Api.pbobjc.h> |
- #import <Protobuf/SourceContext.pbobjc.h> |
- #import <Protobuf/Type.pbobjc.h> |
-#else |
- #import "google/protobuf/Api.pbobjc.h" |
- #import "google/protobuf/SourceContext.pbobjc.h" |
- #import "google/protobuf/Type.pbobjc.h" |
-#endif |
+#import "GPBProtocolBuffers_RuntimeSupport.h" |
+#import "google/protobuf/Api.pbobjc.h" |
+#import "google/protobuf/SourceContext.pbobjc.h" |
+#import "google/protobuf/Type.pbobjc.h" |
// @@protoc_insertion_point(imports) |
#pragma clang diagnostic push |
@@ -31,8 +14,18 @@ |
@implementation GPBApiRoot |
-// No extensions in the file and none of the imports (direct or indirect) |
-// defined extensions, so no need to generate +extensionRegistry. |
++ (GPBExtensionRegistry*)extensionRegistry { |
+ // This is called by +initialize so there is no need to worry |
+ // about thread safety and initialization of registry. |
+ static GPBExtensionRegistry* registry = nil; |
+ if (!registry) { |
+ GPBDebugCheckRuntimeVersion(); |
+ registry = [[GPBExtensionRegistry alloc] init]; |
+ [registry addExtensions:[GPBSourceContextRoot extensionRegistry]]; |
+ [registry addExtensions:[GPBTypeRoot extensionRegistry]]; |
+ } |
+ return registry; |
+} |
@end |
@@ -43,9 +36,8 @@ static GPBFileDescriptor *GPBApiRoot_FileDescriptor(void) { |
// about thread safety of the singleton. |
static GPBFileDescriptor *descriptor = NULL; |
if (!descriptor) { |
- GPB_DEBUG_CHECK_RUNTIME_VERSIONS(); |
+ GPBDebugCheckRuntimeVersion(); |
descriptor = [[GPBFileDescriptor alloc] initWithPackage:@"google.protobuf" |
- objcPrefix:@"GPB" |
syntax:GPBFileSyntaxProto3]; |
} |
return descriptor; |
@@ -140,7 +132,7 @@ typedef struct GPBApi__storage_ { |
.number = GPBApi_FieldNumber_Syntax, |
.hasIndex = 3, |
.offset = (uint32_t)offsetof(GPBApi__storage_, syntax), |
- .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor), |
+ .flags = GPBFieldOptional | GPBFieldHasEnumDescriptor, |
.dataType = GPBDataTypeEnum, |
}, |
}; |
@@ -151,7 +143,7 @@ typedef struct GPBApi__storage_ { |
fields:fields |
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) |
storageSize:sizeof(GPBApi__storage_) |
- flags:GPBDescriptorInitializationFlag_None]; |
+ flags:0]; |
NSAssert(descriptor == nil, @"Startup recursed!"); |
descriptor = localDescriptor; |
} |
@@ -214,7 +206,7 @@ typedef struct GPBMethod__storage_ { |
.number = GPBMethod_FieldNumber_RequestTypeURL, |
.hasIndex = 1, |
.offset = (uint32_t)offsetof(GPBMethod__storage_, requestTypeURL), |
- .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldTextFormatNameCustom), |
+ .flags = GPBFieldOptional | GPBFieldTextFormatNameCustom, |
.dataType = GPBDataTypeString, |
}, |
{ |
@@ -232,7 +224,7 @@ typedef struct GPBMethod__storage_ { |
.number = GPBMethod_FieldNumber_ResponseTypeURL, |
.hasIndex = 4, |
.offset = (uint32_t)offsetof(GPBMethod__storage_, responseTypeURL), |
- .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldTextFormatNameCustom), |
+ .flags = GPBFieldOptional | GPBFieldTextFormatNameCustom, |
.dataType = GPBDataTypeString, |
}, |
{ |
@@ -259,7 +251,7 @@ typedef struct GPBMethod__storage_ { |
.number = GPBMethod_FieldNumber_Syntax, |
.hasIndex = 7, |
.offset = (uint32_t)offsetof(GPBMethod__storage_, syntax), |
- .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor), |
+ .flags = GPBFieldOptional | GPBFieldHasEnumDescriptor, |
.dataType = GPBDataTypeEnum, |
}, |
}; |
@@ -270,7 +262,7 @@ typedef struct GPBMethod__storage_ { |
fields:fields |
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) |
storageSize:sizeof(GPBMethod__storage_) |
- flags:GPBDescriptorInitializationFlag_None]; |
+ flags:0]; |
#if !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS |
static const char *extraTextFormatInfo = |
"\002\002\007\244\241!!\000\004\010\244\241!!\000"; |
@@ -341,7 +333,7 @@ typedef struct GPBMixin__storage_ { |
fields:fields |
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) |
storageSize:sizeof(GPBMixin__storage_) |
- flags:GPBDescriptorInitializationFlag_None]; |
+ flags:0]; |
NSAssert(descriptor == nil, @"Startup recursed!"); |
descriptor = localDescriptor; |
} |