diff options
| author | Yilun Chong <yilunchong@google.com> | 2019-02-26 13:07:59 -0800 |
|---|---|---|
| committer | Yilun Chong <yilunchong@google.com> | 2019-02-26 13:07:59 -0800 |
| commit | af8b91b8280fd55c2eec0e60047b1f11d71bdb7e (patch) | |
| tree | 040621b86578a326ab9399acda411c344dc04fac /csharp | |
| parent | 429d2ae19f56a495b4bddbd664bfb76d2dc225f2 (diff) | |
| download | platform_external_protobuf-af8b91b8280fd55c2eec0e60047b1f11d71bdb7e.tar.gz platform_external_protobuf-af8b91b8280fd55c2eec0e60047b1f11d71bdb7e.tar.bz2 platform_external_protobuf-af8b91b8280fd55c2eec0e60047b1f11d71bdb7e.zip | |
fix csharp by regenerate descriptor
Diffstat (limited to 'csharp')
| -rw-r--r-- | csharp/src/Google.Protobuf.Test/testprotos.pb | bin | 204996 -> 204998 bytes | |||
| -rw-r--r-- | csharp/src/Google.Protobuf/Reflection/Descriptor.cs | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb Binary files differindex 23d927275..09a4c8b3b 100644 --- a/csharp/src/Google.Protobuf.Test/testprotos.pb +++ b/csharp/src/Google.Protobuf.Test/testprotos.pb diff --git a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs index 0c33e63df..3cdaaab85 100644 --- a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs +++ b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs @@ -4996,7 +4996,7 @@ namespace Google.Protobuf.Reflection { /// /// Implementations may choose not to generate the map_entry=true message, but /// use a native map in the target language to hold the keys and values. - /// The reflection APIs in such implementions still need to work as + /// The reflection APIs in such implementations still need to work as /// if the field is a repeated message field. /// /// NOTE: Do not set the option in .proto files. Always use the maps syntax @@ -7238,7 +7238,7 @@ namespace Google.Protobuf.Reflection { /// beginning of the "extend" block and is shared by all extensions within /// the block. /// - Just because a location's span is a subset of some other location's span - /// does not mean that it is a descendent. For example, a "group" defines + /// does not mean that it is a descendant. For example, a "group" defines /// both a type and a field in a single declaration. Thus, the locations /// corresponding to the type and field and their components will overlap. /// - Code which tries to interpret locations should probably be designed to |