aboutsummaryrefslogtreecommitdiffhomepage
path: root/csharp/protos
diff options
context:
space:
mode:
authorGravatar Jon Skeet <jonskeet@google.com>2015-07-30 14:06:01 +0100
committerGravatar Jon Skeet <jonskeet@google.com>2015-07-31 07:00:25 +0100
commitf994cfe8084ee81916a546715254d93c9f2a9380 (patch)
treefd6e6f52a8433d7119825c3e92f45d5db3d3e918 /csharp/protos
parentb193503aa74d493556af0fa08a99ba1fd97035af (diff)
Handle field names of "descriptor" and "types".
Diffstat (limited to 'csharp/protos')
-rw-r--r--csharp/protos/extest/unittest_issues.proto9
1 files changed, 9 insertions, 0 deletions
diff --git a/csharp/protos/extest/unittest_issues.proto b/csharp/protos/extest/unittest_issues.proto
index 33ce7d9b..b0c92fa2 100644
--- a/csharp/protos/extest/unittest_issues.proto
+++ b/csharp/protos/extest/unittest_issues.proto
@@ -80,3 +80,12 @@ message DeprecatedFieldsMessage {
message ItemField {
int32 item = 1;
}
+
+message ReservedNames {
+ // Force a nested type called Types
+ message SomeNestedType {
+ }
+
+ int32 types = 1;
+ int32 descriptor = 2;
+} \ No newline at end of file