Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

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

Issue 2600753002: Reverts third_party/protobuf: Update to HEAD (f52e188fe4) (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
Download patch
Index: third_party/protobuf/objectivec/google/protobuf/Duration.pbobjc.m
diff --git a/third_party/protobuf/objectivec/google/protobuf/Duration.pbobjc.m b/third_party/protobuf/objectivec/google/protobuf/Duration.pbobjc.m
index bafb64a04f64376d6e7157c0af05917bb557945f..7dd6b64a7b150c0c26343149c0f84448b7e3a1f5 100644
--- a/third_party/protobuf/objectivec/google/protobuf/Duration.pbobjc.m
+++ b/third_party/protobuf/objectivec/google/protobuf/Duration.pbobjc.m
@@ -1,23 +1,8 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/protobuf/duration.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/Duration.pbobjc.h>
-#else
- #import "google/protobuf/Duration.pbobjc.h"
-#endif
+#import "GPBProtocolBuffers_RuntimeSupport.h"
+#import "google/protobuf/Duration.pbobjc.h"
// @@protoc_insertion_point(imports)
#pragma clang diagnostic push
@@ -27,9 +12,6 @@
@implementation GPBDurationRoot
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
@end
#pragma mark - GPBDurationRoot_FileDescriptor
@@ -39,9 +21,8 @@ static GPBFileDescriptor *GPBDurationRoot_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;
@@ -92,7 +73,7 @@ typedef struct GPBDuration__storage_ {
fields:fields
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBDuration__storage_)
- flags:GPBDescriptorInitializationFlag_None];
+ flags:0];
NSAssert(descriptor == nil, @"Startup recursed!");
descriptor = localDescriptor;
}

Powered by Google App Engine
This is Rietveld 408576698