From af8b91b8280fd55c2eec0e60047b1f11d71bdb7e Mon Sep 17 00:00:00 2001 From: Yilun Chong Date: Tue, 26 Feb 2019 13:07:59 -0800 Subject: [PATCH] fix csharp by regenerate descriptor --- csharp/src/Google.Protobuf.Test/testprotos.pb | Bin 204996 -> 204998 bytes .../Google.Protobuf/Reflection/Descriptor.cs | 4 ++-- .../Protobuf/Internal/MessageOptions.php | 8 ++++---- .../Protobuf/Internal/SourceCodeInfo.php | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb index 23d927275659dba733c51fba0c7dababc0bbdf7e..09a4c8b3b5c27980d90a3cf47064aadac07fab9c 100644 GIT binary patch delta 66 zcmV-I0KNaj!3@U146x?70nM}LxSkyWuCs>L1y&HC1_}fO3jzZY1nvU@9vYFin=An? Y0s&#S$SwgVGXY_T@L>VB@L>YfzJdW60RR91 delta 64 zcmV-G0Kfmn!3@N~46x?70n4-JxSkyWth0vJ1y&HA1_}fO3jzZY1nvU@9vY9gn=An? W0=LU90VXp6Wry-%0k`sD0@S`(VHlwR diff --git a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs index 0c33e63df4..3cdaaab855 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 diff --git a/php/src/Google/Protobuf/Internal/MessageOptions.php b/php/src/Google/Protobuf/Internal/MessageOptions.php index ccf0919bef..64aeec64c6 100644 --- a/php/src/Google/Protobuf/Internal/MessageOptions.php +++ b/php/src/Google/Protobuf/Internal/MessageOptions.php @@ -70,7 +70,7 @@ class MessageOptions extends \Google\Protobuf\Internal\Message * repeated MapFieldEntry map_field = 1; * 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 * instead. The option should only be implicitly set by the proto compiler @@ -133,7 +133,7 @@ class MessageOptions extends \Google\Protobuf\Internal\Message * repeated MapFieldEntry map_field = 1; * 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 * instead. The option should only be implicitly set by the proto compiler @@ -295,7 +295,7 @@ class MessageOptions extends \Google\Protobuf\Internal\Message * repeated MapFieldEntry map_field = 1; * 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 * instead. The option should only be implicitly set by the proto compiler @@ -323,7 +323,7 @@ class MessageOptions extends \Google\Protobuf\Internal\Message * repeated MapFieldEntry map_field = 1; * 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 * instead. The option should only be implicitly set by the proto compiler diff --git a/php/src/Google/Protobuf/Internal/SourceCodeInfo.php b/php/src/Google/Protobuf/Internal/SourceCodeInfo.php index 75cc3dd247..5519185e1c 100644 --- a/php/src/Google/Protobuf/Internal/SourceCodeInfo.php +++ b/php/src/Google/Protobuf/Internal/SourceCodeInfo.php @@ -55,7 +55,7 @@ class SourceCodeInfo extends \Google\Protobuf\Internal\Message * 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 @@ -109,7 +109,7 @@ class SourceCodeInfo extends \Google\Protobuf\Internal\Message * 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 @@ -158,7 +158,7 @@ class SourceCodeInfo extends \Google\Protobuf\Internal\Message * 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 @@ -209,7 +209,7 @@ class SourceCodeInfo extends \Google\Protobuf\Internal\Message * 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