| Index: third_party/protobuf/objectivec/Tests/unittest_extension_chain_b.proto
|
| diff --git a/third_party/protobuf/src/google/protobuf/util/internal/testdata/struct.proto b/third_party/protobuf/objectivec/Tests/unittest_extension_chain_b.proto
|
| similarity index 77%
|
| copy from third_party/protobuf/src/google/protobuf/util/internal/testdata/struct.proto
|
| copy to third_party/protobuf/objectivec/Tests/unittest_extension_chain_b.proto
|
| index c15aba0d6d9881b8963a0353cdd1e0aa0b4adc11..0da7ed3e4c37bd5e7cf3f6ec7fe23302f831e444 100644
|
| --- a/third_party/protobuf/src/google/protobuf/util/internal/testdata/struct.proto
|
| +++ b/third_party/protobuf/objectivec/Tests/unittest_extension_chain_b.proto
|
| @@ -1,6 +1,5 @@
|
| // Protocol Buffers - Google's data interchange format
|
| -// Copyright 2008 Google Inc. All rights reserved.
|
| -// https://developers.google.com/protocol-buffers/
|
| +// Copyright 2016 Google Inc. All rights reserved.
|
| //
|
| // Redistribution and use in source and binary forms, with or without
|
| // modification, are permitted provided that the following conditions are
|
| @@ -28,18 +27,21 @@
|
| // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| -// Proto to test proto3 struct.
|
| -syntax = "proto3";
|
| +syntax = "proto2";
|
|
|
| -package google.protobuf.testing.structs;
|
| -option java_package = "com.google.protobuf.testing.structs";
|
| +package protobuf_unittest;
|
|
|
| -import "google/protobuf/struct.proto";
|
| +import "google/protobuf/unittest.proto";
|
|
|
| -message StructType {
|
| - google.protobuf.Struct object = 1;
|
| +import "unittest_extension_chain_c.proto";
|
| +
|
| +// The Root for this file should end up adding the local extension and merging
|
| +// in the extensions from C's Root (unittest will come via C's).
|
| +
|
| +message ChainBMessage {
|
| + optional ChainCMessage c = 1;
|
| }
|
|
|
| -service TestService {
|
| - rpc Call(StructType) returns (StructType);
|
| +extend TestAllExtensions {
|
| + optional int32 chain_b_extension = 10002;
|
| }
|
|
|