From 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Mon, 10 Nov 2014 17:34:54 -0800 Subject: Down-integrate from internal code base. --- src/google/protobuf/unittest.proto | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/google/protobuf/unittest.proto') diff --git a/src/google/protobuf/unittest.proto b/src/google/protobuf/unittest.proto index c48cc923..7450fe53 100644 --- a/src/google/protobuf/unittest.proto +++ b/src/google/protobuf/unittest.proto @@ -34,6 +34,7 @@ // // A proto file we will use for unit testing. +syntax = "proto2"; // Some generic_services option(s) added automatically. // See: http://go/proto2-generic-services-default @@ -429,7 +430,7 @@ message TestMutualRecursionB { } // Test that groups have disjoint field numbers from their siblings and -// parents. This is NOT possible in proto1; only proto2. When attempting +// parents. This is NOT possible in proto1; only google.protobuf. When attempting // to compile with proto1, this will emit an error; so we only include it // in protobuf_unittest_proto. message TestDupFieldNumber { // NO_PROTO1 @@ -505,6 +506,15 @@ message TestFieldOrderings { optional int64 my_int = 1; extensions 12 to 100; optional float my_float = 101; + message NestedMessage { + optional int64 oo = 2; + // The field name "b" fails to compile in proto1 because it conflicts with + // a local variable named "b" in one of the generated methods. Doh. + // This file needs to compile in proto1 to test backwards-compatibility. + optional int32 bb = 1; + } + + optional NestedMessage optional_nested_message = 200; } -- cgit v1.2.3