diff options
author | 2017-04-26 15:37:42 +0200 | |
---|---|---|
committer | 2017-05-02 09:51:34 +0200 | |
commit | 2b49f678a7dfaf27afc0e44ed7a65b00ec06d413 (patch) | |
tree | c1c46d0f1f66859ff42fd41f0aefb6436c9f4507 /third_party/protobuf/3.2.0/javanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto | |
parent | b712f335a945c81a6b77fd48e96103ff09c8967b (diff) |
Update third_party/protobuf to pre-release 3.2.0
Update protobuf to @laszlocsomor's fork of protobuf. This is essentially
the development version of protobuf 3.2.0 and windows specific fixes
from laszlo. Those fixes will be merged into protobuf soon:
https://github.com/google/protobuf/pull/2969.
Change-Id: Id88cd7e5b2c27ab74f3ecfa1e127e5a863f2deb3
Diffstat (limited to 'third_party/protobuf/3.2.0/javanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto')
-rw-r--r-- | third_party/protobuf/3.2.0/javanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/third_party/protobuf/3.2.0/javanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto b/third_party/protobuf/3.2.0/javanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto new file mode 100644 index 0000000000..8b2d965888 --- /dev/null +++ b/third_party/protobuf/3.2.0/javanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto @@ -0,0 +1,34 @@ +syntax = "proto2"; + +option java_multiple_files = true; +option java_package = "com.google.protobuf"; + +import "google/protobuf/nano/unittest_extension_nano.proto"; + +// Must be compiled separately due to extension number reuse. +// The reuse is deliberate, for testing wire compatibility. + +message SingularExtensions { + extend ExtendableMessage { + optional int32 some_int32 = 10; + optional uint32 some_uint32 = 11; + optional sint32 some_sint32 = 12; + optional int64 some_int64 = 13; + optional uint64 some_uint64 = 14; + optional sint64 some_sint64 = 15; + optional fixed32 some_fixed32 = 16; + optional sfixed32 some_sfixed32 = 17; + optional fixed64 some_fixed64 = 18; + optional sfixed64 some_sfixed64 = 19; + optional bool some_bool = 20; + optional float some_float = 21; + optional double some_double = 22; + optional AnEnum some_enum = 23; + optional string some_string = 24; + optional bytes some_bytes = 25; + optional AnotherMessage some_message = 26; + optional group SomeGroup = 27 { + optional int32 a = 1; + } + } +} |