Index: third_party/protobuf/objectivec/google/protobuf/Any.pbobjc.m |
diff --git a/third_party/protobuf/objectivec/google/protobuf/Any.pbobjc.m b/third_party/protobuf/objectivec/google/protobuf/Any.pbobjc.m |
index 6a1bf894ff8af90532349bf6ec3f7e20acf09a46..d210643f05bfdd772b9350bbd8a89e989acf93c6 100644 |
--- a/third_party/protobuf/objectivec/google/protobuf/Any.pbobjc.m |
+++ b/third_party/protobuf/objectivec/google/protobuf/Any.pbobjc.m |
@@ -1,8 +1,23 @@ |
// Generated by the protocol buffer compiler. DO NOT EDIT! |
// source: google/protobuf/any.proto |
-#import "GPBProtocolBuffers_RuntimeSupport.h" |
-#import "google/protobuf/Any.pbobjc.h" |
+// 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/Any.pbobjc.h> |
+#else |
+ #import "google/protobuf/Any.pbobjc.h" |
+#endif |
// @@protoc_insertion_point(imports) |
#pragma clang diagnostic push |
@@ -12,6 +27,9 @@ |
@implementation GPBAnyRoot |
+// No extensions in the file and no imports, so no need to generate |
+// +extensionRegistry. |
+ |
@end |
#pragma mark - GPBAnyRoot_FileDescriptor |
@@ -21,8 +39,9 @@ static GPBFileDescriptor *GPBAnyRoot_FileDescriptor(void) { |
// about thread safety of the singleton. |
static GPBFileDescriptor *descriptor = NULL; |
if (!descriptor) { |
- GPBDebugCheckRuntimeVersion(); |
+ GPB_DEBUG_CHECK_RUNTIME_VERSIONS(); |
descriptor = [[GPBFileDescriptor alloc] initWithPackage:@"google.protobuf" |
+ objcPrefix:@"GPB" |
syntax:GPBFileSyntaxProto3]; |
} |
return descriptor; |
@@ -53,7 +72,7 @@ typedef struct GPBAny__storage_ { |
.number = GPBAny_FieldNumber_TypeURL, |
.hasIndex = 0, |
.offset = (uint32_t)offsetof(GPBAny__storage_, typeURL), |
- .flags = GPBFieldOptional | GPBFieldTextFormatNameCustom, |
+ .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldTextFormatNameCustom), |
.dataType = GPBDataTypeString, |
}, |
{ |
@@ -73,7 +92,7 @@ typedef struct GPBAny__storage_ { |
fields:fields |
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) |
storageSize:sizeof(GPBAny__storage_) |
- flags:0]; |
+ flags:GPBDescriptorInitializationFlag_None]; |
#if !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS |
static const char *extraTextFormatInfo = |
"\001\001\004\241!!\000"; |