summaryrefslogtreecommitdiffstats
path: root/src/google/protobuf/unittest_nano.proto
diff options
context:
space:
mode:
Diffstat (limited to 'src/google/protobuf/unittest_nano.proto')
-rw-r--r--src/google/protobuf/unittest_nano.proto5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/google/protobuf/unittest_nano.proto b/src/google/protobuf/unittest_nano.proto
index c689ac0..62af6bc 100644
--- a/src/google/protobuf/unittest_nano.proto
+++ b/src/google/protobuf/unittest_nano.proto
@@ -152,6 +152,11 @@ message TestAllTypesNano {
optional string default_cord = 85 [ctype=CORD,default="123"];
required int32 id = 86;
+
+ // Try to cause conflicts.
+ optional int32 tag = 93;
+ optional int32 get_serialized_size = 94;
+ optional int32 write_to = 95;
}
message ForeignMessageNano {