diff options
author | Yilun Chong <yilunchong@google.com> | 2017-06-30 17:22:32 -0700 |
---|---|---|
committer | Yilun Chong <yilunchong@google.com> | 2017-06-30 17:22:32 -0700 |
commit | 3adb054bbfa83530ca5a5fd54a856755fd72af83 (patch) | |
tree | 4d09a00969cdc7833dca181d6910b79f5ac877ae /src | |
parent | a7d5be6a910caabc4b26d73bc5c369dbc638c4c3 (diff) | |
download | protobuf-3adb054bbfa83530ca5a5fd54a856755fd72af83.tar.gz protobuf-3adb054bbfa83530ca5a5fd54a856755fd72af83.tar.bz2 protobuf-3adb054bbfa83530ca5a5fd54a856755fd72af83.zip |
add some test proto2 supported, add js proto2 supported, fixed some error
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/test_messages_proto2.proto | 2 | ||||
-rw-r--r-- | src/google/protobuf/test_messages_proto3.proto | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/test_messages_proto2.proto b/src/google/protobuf/test_messages_proto2.proto index 58fb0060..cbe0d170 100644 --- a/src/google/protobuf/test_messages_proto2.proto +++ b/src/google/protobuf/test_messages_proto2.proto @@ -213,4 +213,4 @@ enum ForeignEnum { extend TestAllTypesProto2 { optional int32 extension_int32 = 120; -}
\ No newline at end of file +} diff --git a/src/google/protobuf/test_messages_proto3.proto b/src/google/protobuf/test_messages_proto3.proto index 79230334..abf73427 100644 --- a/src/google/protobuf/test_messages_proto3.proto +++ b/src/google/protobuf/test_messages_proto3.proto @@ -59,10 +59,10 @@ option cc_enable_arenas = true; // submessages of this message. So for example, a fuzz test of TestAllTypes // could trigger bugs that occur in any message type in this file. We verify // this stays true in a unit test. -message TestAllTypes { +message TestAllTypesProto3 { message NestedMessage { int32 a = 1; - TestAllTypes corecursive = 2; + TestAllTypesProto3 corecursive = 2; } enum NestedEnum { @@ -98,7 +98,7 @@ message TestAllTypes { string optional_string_piece = 24 [ctype=STRING_PIECE]; string optional_cord = 25 [ctype=CORD]; - TestAllTypes recursive_message = 27; + TestAllTypesProto3 recursive_message = 27; // Repeated repeated int32 repeated_int32 = 31; |