diff options
author | Jon Skeet <skeet@pobox.com> | 2015-07-31 08:13:47 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-07-31 08:13:47 +0100 |
commit | 5bdb1fb31117a1903808dabc991e282463d99009 (patch) | |
tree | fd6e6f52a8433d7119825c3e92f45d5db3d3e918 /csharp/protos | |
parent | b193503aa74d493556af0fa08a99ba1fd97035af (diff) | |
parent | f994cfe8084ee81916a546715254d93c9f2a9380 (diff) | |
download | protobuf-5bdb1fb31117a1903808dabc991e282463d99009.tar.gz protobuf-5bdb1fb31117a1903808dabc991e282463d99009.tar.bz2 protobuf-5bdb1fb31117a1903808dabc991e282463d99009.zip |
Merge pull request #665 from jskeet/types_field
Handle field names of "descriptor" and "types".
Diffstat (limited to 'csharp/protos')
-rw-r--r-- | csharp/protos/extest/unittest_issues.proto | 9 |
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 |