From bca797dac9c5c6f549be12e2bc9addbf51b1d18f Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Wed, 28 Mar 2018 16:53:39 -0400 Subject: Trim imports for bundled generated protos. To avoid a cycle between headers, have the WKTs use minimal imports instead of using the helper to get everything from the library. Fixes https://github.com/google/protobuf/issues/4301 Fixes https://github.com/google/protobuf/issues/4403 --- objectivec/google/protobuf/Duration.pbobjc.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'objectivec/google/protobuf/Duration.pbobjc.h') diff --git a/objectivec/google/protobuf/Duration.pbobjc.h b/objectivec/google/protobuf/Duration.pbobjc.h index d9a388ac..3e367590 100644 --- a/objectivec/google/protobuf/Duration.pbobjc.h +++ b/objectivec/google/protobuf/Duration.pbobjc.h @@ -8,9 +8,13 @@ #endif #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS - #import + #import + #import + #import #else - #import "GPBProtocolBuffers.h" + #import "GPBDescriptor.h" + #import "GPBMessage.h" + #import "GPBRootObject.h" #endif #if GOOGLE_PROTOBUF_OBJC_VERSION < 30002 -- cgit v1.2.3