third_party/protobuf/objectivec/google/protobuf/Wrappers.pbobjc.m - Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

Unified Diff: third_party/protobuf/objectivec/google/protobuf/Wrappers.pbobjc.m

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)

Patch Set: Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/protobuf/objectivec/google/protobuf/Wrappers.pbobjc.h ('k') | third_party/protobuf/patches/0004-fix-integer-types-and-shared-library-exports.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/objectivec/google/protobuf/Wrappers.pbobjc.m

diff --git a/third_party/protobuf/objectivec/google/protobuf/Wrappers.pbobjc.m b/third_party/protobuf/objectivec/google/protobuf/Wrappers.pbobjc.m

index 5479eb127b54f0517e7432bd5bd2c39a87dd1451..5cc6c2e409208cd33510260a5d8539a86495eda5 100644

--- a/third_party/protobuf/objectivec/google/protobuf/Wrappers.pbobjc.m

+++ b/third_party/protobuf/objectivec/google/protobuf/Wrappers.pbobjc.m

@@ -1,23 +1,8 @@

// Generated by the protocol buffer compiler. DO NOT EDIT!

// source: google/protobuf/wrappers.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/Wrappers.pbobjc.h>

-#else

- #import "google/protobuf/Wrappers.pbobjc.h"

-#endif

+#import "GPBProtocolBuffers_RuntimeSupport.h"

+#import "google/protobuf/Wrappers.pbobjc.h"

// @@protoc_insertion_point(imports)

#pragma clang diagnostic push

@@ -27,9 +12,6 @@

@implementation GPBWrappersRoot

-// No extensions in the file and no imports, so no need to generate

-// +extensionRegistry.

@end

#pragma mark - GPBWrappersRoot_FileDescriptor

@@ -39,9 +21,8 @@ static GPBFileDescriptor *GPBWrappersRoot_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;

@@ -81,7 +62,7 @@ typedef struct GPBDoubleValue__storage_ {

fields:fields

fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))

storageSize:sizeof(GPBDoubleValue__storage_)

- flags:GPBDescriptorInitializationFlag_None];

+ flags:0];

NSAssert(descriptor == nil, @"Startup recursed!");

descriptor = localDescriptor;

}

@@ -124,7 +105,7 @@ typedef struct GPBFloatValue__storage_ {

fields:fields

fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))

storageSize:sizeof(GPBFloatValue__storage_)

- flags:GPBDescriptorInitializationFlag_None];

+ flags:0];

NSAssert(descriptor == nil, @"Startup recursed!");

descriptor = localDescriptor;

}

@@ -167,7 +148,7 @@ typedef struct GPBInt64Value__storage_ {

fields:fields

fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))

storageSize:sizeof(GPBInt64Value__storage_)

- flags:GPBDescriptorInitializationFlag_None];

+ flags:0];

NSAssert(descriptor == nil, @"Startup recursed!");

descriptor = localDescriptor;

}

@@ -210,7 +191,7 @@ typedef struct GPBUInt64Value__storage_ {

fields:fields

fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))

storageSize:sizeof(GPBUInt64Value__storage_)

- flags:GPBDescriptorInitializationFlag_None];

+ flags:0];

NSAssert(descriptor == nil, @"Startup recursed!");

descriptor = localDescriptor;

}

@@ -253,7 +234,7 @@ typedef struct GPBInt32Value__storage_ {

fields:fields

fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))

storageSize:sizeof(GPBInt32Value__storage_)

- flags:GPBDescriptorInitializationFlag_None];

+ flags:0];

NSAssert(descriptor == nil, @"Startup recursed!");

descriptor = localDescriptor;

}

@@ -296,7 +277,7 @@ typedef struct GPBUInt32Value__storage_ {

fields:fields

fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))

storageSize:sizeof(GPBUInt32Value__storage_)

- flags:GPBDescriptorInitializationFlag_None];

+ flags:0];

NSAssert(descriptor == nil, @"Startup recursed!");

descriptor = localDescriptor;

}

@@ -338,7 +319,7 @@ typedef struct GPBBoolValue__storage_ {

fields:fields

fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))

storageSize:sizeof(GPBBoolValue__storage_)

- flags:GPBDescriptorInitializationFlag_None];

+ flags:0];

NSAssert(descriptor == nil, @"Startup recursed!");

descriptor = localDescriptor;

}

@@ -381,7 +362,7 @@ typedef struct GPBStringValue__storage_ {

fields:fields

fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))

storageSize:sizeof(GPBStringValue__storage_)

- flags:GPBDescriptorInitializationFlag_None];

+ flags:0];

NSAssert(descriptor == nil, @"Startup recursed!");

descriptor = localDescriptor;

}

@@ -424,7 +405,7 @@ typedef struct GPBBytesValue__storage_ {

fields:fields

fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))

storageSize:sizeof(GPBBytesValue__storage_)

- flags:GPBDescriptorInitializationFlag_None];

+ flags:0];

NSAssert(descriptor == nil, @"Startup recursed!");

descriptor = localDescriptor;

}