Index: third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs |
diff --git a/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs b/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs |
index a811ea8b3f21ba672803c41ea85e25323a040874..edc8940db3fb92798131c73d5cd13b3e24c9f075 100644 |
--- a/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs |
+++ b/third_party/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs |
@@ -34,15 +34,16 @@ namespace Google.Protobuf.WellKnownTypes { |
"ABIwCgpsaXN0X3ZhbHVlGAYgASgLMhouZ29vZ2xlLnByb3RvYnVmLkxpc3RW", |
"YWx1ZUgAQgYKBGtpbmQiMwoJTGlzdFZhbHVlEiYKBnZhbHVlcxgBIAMoCzIW", |
"Lmdvb2dsZS5wcm90b2J1Zi5WYWx1ZSobCglOdWxsVmFsdWUSDgoKTlVMTF9W", |
- "QUxVRRAAQk4KE2NvbS5nb29nbGUucHJvdG9idWZCC1N0cnVjdFByb3RvUAGg", |
- "AQGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnBy", |
- "b3RvMw==")); |
+ "QUxVRRAAQoEBChNjb20uZ29vZ2xlLnByb3RvYnVmQgtTdHJ1Y3RQcm90b1AB", |
+ "WjFnaXRodWIuY29tL2dvbGFuZy9wcm90b2J1Zi9wdHlwZXMvc3RydWN0O3N0", |
+ "cnVjdHBioAEBogIDR1BCqgIeR29vZ2xlLlByb3RvYnVmLldlbGxLbm93blR5", |
+ "cGVzYgZwcm90bzM=")); |
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, |
new pbr::FileDescriptor[] { }, |
- new pbr::GeneratedCodeInfo(new[] {typeof(global::Google.Protobuf.WellKnownTypes.NullValue), }, new pbr::GeneratedCodeInfo[] { |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Struct), global::Google.Protobuf.WellKnownTypes.Struct.Parser, new[]{ "Fields" }, null, null, new pbr::GeneratedCodeInfo[] { null, }), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Value), global::Google.Protobuf.WellKnownTypes.Value.Parser, new[]{ "NullValue", "NumberValue", "StringValue", "BoolValue", "StructValue", "ListValue" }, new[]{ "Kind" }, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.ListValue), global::Google.Protobuf.WellKnownTypes.ListValue.Parser, new[]{ "Values" }, null, null, null) |
+ new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Protobuf.WellKnownTypes.NullValue), }, new pbr::GeneratedClrTypeInfo[] { |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Struct), global::Google.Protobuf.WellKnownTypes.Struct.Parser, new[]{ "Fields" }, null, null, new pbr::GeneratedClrTypeInfo[] { null, }), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Value), global::Google.Protobuf.WellKnownTypes.Value.Parser, new[]{ "NullValue", "NumberValue", "StringValue", "BoolValue", "StructValue", "ListValue" }, new[]{ "Kind" }, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.ListValue), global::Google.Protobuf.WellKnownTypes.ListValue.Parser, new[]{ "Values" }, null, null, null) |
})); |
} |
#endregion |
@@ -59,7 +60,7 @@ namespace Google.Protobuf.WellKnownTypes { |
/// <summary> |
/// Null value. |
/// </summary> |
- NULL_VALUE = 0, |
+ [pbr::OriginalName("NULL_VALUE")] NullValue = 0, |
} |
#endregion |
@@ -108,7 +109,7 @@ namespace Google.Protobuf.WellKnownTypes { |
= new pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value>.Codec(pb::FieldCodec.ForString(10), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Value.Parser), 10); |
private readonly pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value> fields_ = new pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value>(); |
/// <summary> |
- /// Map of dynamically typed values. |
+ /// Unordered map of dynamically typed values. |
/// </summary> |
public pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value> Fields { |
get { return fields_; } |
@@ -234,7 +235,7 @@ namespace Google.Protobuf.WellKnownTypes { |
/// Represents a null value. |
/// </summary> |
public global::Google.Protobuf.WellKnownTypes.NullValue NullValue { |
- get { return kindCase_ == KindOneofCase.NullValue ? (global::Google.Protobuf.WellKnownTypes.NullValue) kind_ : global::Google.Protobuf.WellKnownTypes.NullValue.NULL_VALUE; } |
+ get { return kindCase_ == KindOneofCase.NullValue ? (global::Google.Protobuf.WellKnownTypes.NullValue) kind_ : 0; } |
set { |
kind_ = value; |
kindCase_ = KindOneofCase.NullValue; |
@@ -262,7 +263,7 @@ namespace Google.Protobuf.WellKnownTypes { |
public string StringValue { |
get { return kindCase_ == KindOneofCase.StringValue ? (string) kind_ : ""; } |
set { |
- kind_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ kind_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
kindCase_ = KindOneofCase.StringValue; |
} |
} |