third_party/protobuf/objectivec/GPBProtocolBuffers.h - Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/objectivec/GPBProtocolBuffers.h

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

Download patch

« no previous file with comments | « third_party/protobuf/objectivec/GPBMessage_PackagePrivate.h ('k') | third_party/protobuf/objectivec/GPBProtocolBuffers.m » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/objectivec/GPBProtocolBuffers.h

diff --git a/third_party/protobuf/objectivec/GPBProtocolBuffers.h b/third_party/protobuf/objectivec/GPBProtocolBuffers.h

index 68d8854eb8e7ffd4a4476b31e30783cd519a3ff6..677903ed76b67a805aa0ec5c5056f639395b60e4 100644

--- a/third_party/protobuf/objectivec/GPBProtocolBuffers.h

+++ b/third_party/protobuf/objectivec/GPBProtocolBuffers.h

@@ -44,33 +44,14 @@

#import "GPBWellKnownTypes.h"

#import "GPBWireFormat.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

// Well-known proto types

-#if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS

- #import <Protobuf/Any.pbobjc.h>

- #import <Protobuf/Api.pbobjc.h>

- #import <Protobuf/Duration.pbobjc.h>

- #import <Protobuf/Empty.pbobjc.h>

- #import <Protobuf/FieldMask.pbobjc.h>

- #import <Protobuf/SourceContext.pbobjc.h>

- #import <Protobuf/Struct.pbobjc.h>

- #import <Protobuf/Timestamp.pbobjc.h>

- #import <Protobuf/Type.pbobjc.h>

- #import <Protobuf/Wrappers.pbobjc.h>

-#else

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

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

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

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

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

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

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

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

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

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

-#endif

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

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

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

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

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

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

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

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

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

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