| Index: third_party/protobuf/src/google/protobuf/unittest_no_arena_import.proto
|
| diff --git a/third_party/protobuf/src/google/protobuf/unittest_import_public.proto b/third_party/protobuf/src/google/protobuf/unittest_no_arena_import.proto
|
| similarity index 87%
|
| copy from third_party/protobuf/src/google/protobuf/unittest_import_public.proto
|
| copy to third_party/protobuf/src/google/protobuf/unittest_no_arena_import.proto
|
| index ea5d1b13fea77a432cecc0980664c020159d108a..072af49e3c70472873b61fa17ba3d33d37f9f8d3 100644
|
| --- a/third_party/protobuf/src/google/protobuf/unittest_import_public.proto
|
| +++ b/third_party/protobuf/src/google/protobuf/unittest_no_arena_import.proto
|
| @@ -1,6 +1,6 @@
|
| // 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,13 +28,10 @@
|
| // (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: liujisi@google.com (Pherl Liu)
|
| +syntax = "proto2";
|
|
|
| +package proto2_arena_unittest;
|
|
|
| -package protobuf_unittest_import;
|
| -
|
| -option java_package = "com.google.protobuf.test";
|
| -
|
| -message PublicImportMessage {
|
| - optional int32 e = 1;
|
| -}
|
| +message ImportNoArenaNestedMessage {
|
| + optional int32 d = 1;
|
| +};
|
|
|