diff options
| author |  Jon Skeet <jonskeet@google.com> | 2016-04-08 12:33:09 +0100 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2016-04-20 03:46:00 +0100 |
| commit | 84ea2c7a81c69ce675d025074d6891a32ea3f629 (patch) | |
| tree | 3d35abd02e1415129fdce76624243b99e36714f6 /csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs | |
| parent | 75626ed79c726ed9fd96d9d143ce6b6c88413bf8 (diff) | |
Regenerate all C# code and make it compile
JSON tests fail, as we're not using OriginalNameAttribute yet.
Diffstat (limited to 'csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs index 8e2ce8cf..c9da30d5 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs @@ -59,7 +59,7 @@ namespace Google.Protobuf.WellKnownTypes { /// <summary> /// Null value. /// </summary> - NULL_VALUE = 0, + [pbr::OriginalName("NULL_VALUE")] NullValue = 0, } #endregion @@ -234,7 +234,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; |