Index: third_party/protobuf/objectivec/google/protobuf/Struct.pbobjc.m |
diff --git a/third_party/protobuf/objectivec/google/protobuf/Struct.pbobjc.m b/third_party/protobuf/objectivec/google/protobuf/Struct.pbobjc.m |
index f36ec582f9805d755462977e3bc97d0893793da9..609400274ae49938c6edea5d88308fcc50d058fc 100644 |
--- a/third_party/protobuf/objectivec/google/protobuf/Struct.pbobjc.m |
+++ b/third_party/protobuf/objectivec/google/protobuf/Struct.pbobjc.m |
@@ -1,36 +1,17 @@ |
// Generated by the protocol buffer compiler. DO NOT EDIT! |
// source: google/protobuf/struct.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/Struct.pbobjc.h> |
-#else |
- #import "google/protobuf/Struct.pbobjc.h" |
-#endif |
+#import "GPBProtocolBuffers_RuntimeSupport.h" |
+#import "google/protobuf/Struct.pbobjc.h" |
// @@protoc_insertion_point(imports) |
#pragma clang diagnostic push |
#pragma clang diagnostic ignored "-Wdeprecated-declarations" |
-#pragma clang diagnostic ignored "-Wdirect-ivar-access" |
#pragma mark - GPBStructRoot |
@implementation GPBStructRoot |
-// No extensions in the file and no imports, so no need to generate |
-// +extensionRegistry. |
- |
@end |
#pragma mark - GPBStructRoot_FileDescriptor |
@@ -40,9 +21,8 @@ static GPBFileDescriptor *GPBStructRoot_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; |
@@ -114,7 +94,7 @@ typedef struct GPBStruct__storage_ { |
fields:fields |
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) |
storageSize:sizeof(GPBStruct__storage_) |
- flags:GPBDescriptorInitializationFlag_None]; |
+ flags:0]; |
NSAssert(descriptor == nil, @"Startup recursed!"); |
descriptor = localDescriptor; |
} |
@@ -156,7 +136,7 @@ typedef struct GPBValue__storage_ { |
.number = GPBValue_FieldNumber_NullValue, |
.hasIndex = -1, |
.offset = (uint32_t)offsetof(GPBValue__storage_, nullValue), |
- .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor), |
+ .flags = GPBFieldOptional | GPBFieldHasEnumDescriptor, |
.dataType = GPBDataTypeEnum, |
}, |
{ |
@@ -212,7 +192,7 @@ typedef struct GPBValue__storage_ { |
fields:fields |
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) |
storageSize:sizeof(GPBValue__storage_) |
- flags:GPBDescriptorInitializationFlag_None]; |
+ flags:0]; |
static const char *oneofs[] = { |
"kind", |
}; |
@@ -241,7 +221,7 @@ void SetGPBValue_NullValue_RawValue(GPBValue *message, int32_t value) { |
void GPBValue_ClearKindOneOfCase(GPBValue *message) { |
GPBDescriptor *descriptor = [message descriptor]; |
- GPBOneofDescriptor *oneof = [descriptor.oneofs objectAtIndex:0]; |
+ GPBOneofDescriptor *oneof = descriptor->oneofs_[0]; |
GPBMaybeClearOneof(message, oneof, -1, 0); |
} |
#pragma mark - GPBListValue |
@@ -278,7 +258,7 @@ typedef struct GPBListValue__storage_ { |
fields:fields |
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) |
storageSize:sizeof(GPBListValue__storage_) |
- flags:GPBDescriptorInitializationFlag_None]; |
+ flags:0]; |
NSAssert(descriptor == nil, @"Startup recursed!"); |
descriptor = localDescriptor; |
} |