| Index: third_party/protobuf/objectivec/Tests/GPBARCUnittestProtos.m
|
| diff --git a/third_party/protobuf/python/google/protobuf/internal/more_extensions_dynamic.proto b/third_party/protobuf/objectivec/Tests/GPBARCUnittestProtos.m
|
| similarity index 55%
|
| copy from third_party/protobuf/python/google/protobuf/internal/more_extensions_dynamic.proto
|
| copy to third_party/protobuf/objectivec/Tests/GPBARCUnittestProtos.m
|
| index df98ac4bd1929fda636c9e2fce1a9184ebf5d472..d0408869b13bcc388e195e4a4e23dbfd0d19a048 100644
|
| --- a/third_party/protobuf/python/google/protobuf/internal/more_extensions_dynamic.proto
|
| +++ b/third_party/protobuf/objectivec/Tests/GPBARCUnittestProtos.m
|
| @@ -1,6 +1,10 @@
|
| +#if !defined(__has_feature) || !__has_feature(objc_arc)
|
| +#error "This file requires ARC support."
|
| +#endif
|
| +
|
| // Protocol Buffers - Google's data interchange format
|
| // Copyright 2008 Google Inc. All rights reserved.
|
| -// http://code.google.com/p/protobuf/
|
| +// https://developers.google.com/protocol-buffers/
|
| //
|
| // Redistribution and use in source and binary forms, with or without
|
| // modification, are permitted provided that the following conditions are
|
| @@ -28,22 +32,25 @@
|
| // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| -// Author: jasonh@google.com (Jason Hsueh)
|
| -//
|
| -// This file is used to test a corner case in the CPP implementation where the
|
| -// generated C++ type is available for the extendee, but the extension is
|
| -// defined in a file whose C++ type is not in the binary.
|
| -
|
| -
|
| -import "google/protobuf/internal/more_extensions.proto";
|
| -
|
| -package google.protobuf.internal;
|
| -
|
| -message DynamicMessageType {
|
| - optional int32 a = 1;
|
| -}
|
| +// Makes sure all the generated headers compile with ARC on.
|
|
|
| -extend ExtendedMessage {
|
| - optional int32 dynamic_int32_extension = 100;
|
| - optional DynamicMessageType dynamic_message_extension = 101;
|
| -}
|
| +#import "google/protobuf/Unittest.pbobjc.h"
|
| +#import "google/protobuf/UnittestCustomOptions.pbobjc.h"
|
| +#import "google/protobuf/UnittestCycle.pbobjc.h"
|
| +#import "google/protobuf/UnittestDropUnknownFields.pbobjc.h"
|
| +#import "google/protobuf/UnittestEmbedOptimizeFor.pbobjc.h"
|
| +#import "google/protobuf/UnittestEmpty.pbobjc.h"
|
| +#import "google/protobuf/UnittestEnormousDescriptor.pbobjc.h"
|
| +#import "google/protobuf/UnittestImport.pbobjc.h"
|
| +#import "google/protobuf/UnittestImportLite.pbobjc.h"
|
| +#import "google/protobuf/UnittestImportPublic.pbobjc.h"
|
| +#import "google/protobuf/UnittestImportPublicLite.pbobjc.h"
|
| +#import "google/protobuf/UnittestLite.pbobjc.h"
|
| +#import "google/protobuf/UnittestMset.pbobjc.h"
|
| +#import "google/protobuf/UnittestNoGenericServices.pbobjc.h"
|
| +#import "google/protobuf/UnittestObjc.pbobjc.h"
|
| +#import "google/protobuf/UnittestObjcStartup.pbobjc.h"
|
| +#import "google/protobuf/UnittestOptimizeFor.pbobjc.h"
|
| +#import "google/protobuf/UnittestPreserveUnknownEnum.pbobjc.h"
|
| +#import "google/protobuf/UnittestRuntimeProto2.pbobjc.h"
|
| +#import "google/protobuf/UnittestRuntimeProto3.pbobjc.h"
|
|
|