Index: third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs |
diff --git a/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs b/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs |
index 1b925b9cbc9c09163df511038f23a29932f43920..e568a2c981a698595605e3d61f4ed0b2b9556d99 100644 |
--- a/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs |
+++ b/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs |
@@ -41,10 +41,10 @@ namespace Google.Protobuf.WellKnownTypes { |
"ZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IGcHJvdG8z")); |
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, |
new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.SourceContextReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.TypeReflection.Descriptor, }, |
- new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Api), global::Google.Protobuf.WellKnownTypes.Api.Parser, new[]{ "Name", "Methods", "Options", "Version", "SourceContext", "Mixins", "Syntax" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Method), global::Google.Protobuf.WellKnownTypes.Method.Parser, new[]{ "Name", "RequestTypeUrl", "RequestStreaming", "ResponseTypeUrl", "ResponseStreaming", "Options", "Syntax" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Mixin), global::Google.Protobuf.WellKnownTypes.Mixin.Parser, new[]{ "Name", "Root" }, null, null, null) |
+ new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Api), global::Google.Protobuf.WellKnownTypes.Api.Parser, new[]{ "Name", "Methods", "Options", "Version", "SourceContext", "Mixins", "Syntax" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Method), global::Google.Protobuf.WellKnownTypes.Method.Parser, new[]{ "Name", "RequestTypeUrl", "RequestStreaming", "ResponseTypeUrl", "ResponseStreaming", "Options", "Syntax" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Mixin), global::Google.Protobuf.WellKnownTypes.Mixin.Parser, new[]{ "Name", "Root" }, null, null, null) |
})); |
} |
#endregion |
@@ -97,7 +97,7 @@ namespace Google.Protobuf.WellKnownTypes { |
public string Name { |
get { return name_; } |
set { |
- name_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -153,7 +153,7 @@ namespace Google.Protobuf.WellKnownTypes { |
public string Version { |
get { return version_; } |
set { |
- version_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ version_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -185,7 +185,7 @@ namespace Google.Protobuf.WellKnownTypes { |
/// <summary>Field number for the "syntax" field.</summary> |
public const int SyntaxFieldNumber = 7; |
- private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2; |
+ private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = 0; |
/// <summary> |
/// The source syntax of the service. |
/// </summary> |
@@ -225,7 +225,7 @@ namespace Google.Protobuf.WellKnownTypes { |
if (Version.Length != 0) hash ^= Version.GetHashCode(); |
if (sourceContext_ != null) hash ^= SourceContext.GetHashCode(); |
hash ^= mixins_.GetHashCode(); |
- if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) hash ^= Syntax.GetHashCode(); |
+ if (Syntax != 0) hash ^= Syntax.GetHashCode(); |
return hash; |
} |
@@ -249,7 +249,7 @@ namespace Google.Protobuf.WellKnownTypes { |
output.WriteMessage(SourceContext); |
} |
mixins_.WriteTo(output, _repeated_mixins_codec); |
- if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) { |
+ if (Syntax != 0) { |
output.WriteRawTag(56); |
output.WriteEnum((int) Syntax); |
} |
@@ -269,7 +269,7 @@ namespace Google.Protobuf.WellKnownTypes { |
size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContext); |
} |
size += mixins_.CalculateSize(_repeated_mixins_codec); |
- if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) { |
+ if (Syntax != 0) { |
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax); |
} |
return size; |
@@ -294,7 +294,7 @@ namespace Google.Protobuf.WellKnownTypes { |
SourceContext.MergeFrom(other.SourceContext); |
} |
mixins_.Add(other.mixins_); |
- if (other.Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) { |
+ if (other.Syntax != 0) { |
Syntax = other.Syntax; |
} |
} |
@@ -388,7 +388,7 @@ namespace Google.Protobuf.WellKnownTypes { |
public string Name { |
get { return name_; } |
set { |
- name_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -401,7 +401,7 @@ namespace Google.Protobuf.WellKnownTypes { |
public string RequestTypeUrl { |
get { return requestTypeUrl_; } |
set { |
- requestTypeUrl_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ requestTypeUrl_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -427,7 +427,7 @@ namespace Google.Protobuf.WellKnownTypes { |
public string ResponseTypeUrl { |
get { return responseTypeUrl_; } |
set { |
- responseTypeUrl_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ responseTypeUrl_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -458,7 +458,7 @@ namespace Google.Protobuf.WellKnownTypes { |
/// <summary>Field number for the "syntax" field.</summary> |
public const int SyntaxFieldNumber = 7; |
- private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2; |
+ private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = 0; |
/// <summary> |
/// The source syntax of this method. |
/// </summary> |
@@ -498,7 +498,7 @@ namespace Google.Protobuf.WellKnownTypes { |
if (ResponseTypeUrl.Length != 0) hash ^= ResponseTypeUrl.GetHashCode(); |
if (ResponseStreaming != false) hash ^= ResponseStreaming.GetHashCode(); |
hash ^= options_.GetHashCode(); |
- if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) hash ^= Syntax.GetHashCode(); |
+ if (Syntax != 0) hash ^= Syntax.GetHashCode(); |
return hash; |
} |
@@ -528,7 +528,7 @@ namespace Google.Protobuf.WellKnownTypes { |
output.WriteBool(ResponseStreaming); |
} |
options_.WriteTo(output, _repeated_options_codec); |
- if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) { |
+ if (Syntax != 0) { |
output.WriteRawTag(56); |
output.WriteEnum((int) Syntax); |
} |
@@ -552,7 +552,7 @@ namespace Google.Protobuf.WellKnownTypes { |
size += 1 + 1; |
} |
size += options_.CalculateSize(_repeated_options_codec); |
- if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) { |
+ if (Syntax != 0) { |
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax); |
} |
return size; |
@@ -578,7 +578,7 @@ namespace Google.Protobuf.WellKnownTypes { |
ResponseStreaming = other.ResponseStreaming; |
} |
options_.Add(other.options_); |
- if (other.Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) { |
+ if (other.Syntax != 0) { |
Syntax = other.Syntax; |
} |
} |
@@ -653,7 +653,6 @@ namespace Google.Protobuf.WellKnownTypes { |
/// |
/// package google.storage.v2; |
/// service Storage { |
- /// // (-- see AccessControl.GetAcl --) |
/// rpc GetAcl(GetAclRequest) returns (Acl); |
/// |
/// // Get a data record. |
@@ -741,7 +740,7 @@ namespace Google.Protobuf.WellKnownTypes { |
public string Name { |
get { return name_; } |
set { |
- name_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -755,7 +754,7 @@ namespace Google.Protobuf.WellKnownTypes { |
public string Root { |
get { return root_; } |
set { |
- root_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ root_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |