diff options
| author |  Jon Skeet <jonskeet@google.com> | 2015-11-05 09:13:53 +0000 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2015-11-09 09:22:45 +0000 |
| commit | 284bb452e48a3cf3346f00b0ea5579d8fe854573 (patch) | |
| tree | 69fb9f4b6e11543f8121438522f4ef541837eade /csharp/src/Google.Protobuf/JsonParser.cs | |
| parent | 61a50b9e6b3c2898eb1446230f3ed74f9c8be7f9 (diff) | |
Generated code changes and manual changes for previous commit.
Diffstat (limited to 'csharp/src/Google.Protobuf/JsonParser.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf/JsonParser.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/csharp/src/Google.Protobuf/JsonParser.cs b/csharp/src/Google.Protobuf/JsonParser.cs index c34f84fb..9e1c83cc 100644 --- a/csharp/src/Google.Protobuf/JsonParser.cs +++ b/csharp/src/Google.Protobuf/JsonParser.cs @@ -92,7 +92,7 @@ namespace Google.Protobuf // dictionary initialization. private static void MergeWrapperField(JsonParser parser, IMessage message, JsonTokenizer tokenizer) { - parser.MergeField(message, message.Descriptor.Fields[Wrappers.WrapperValueFieldNumber], tokenizer); + parser.MergeField(message, message.Descriptor.Fields[WrappersReflection.WrapperValueFieldNumber], tokenizer); } /// <summary> @@ -294,7 +294,7 @@ namespace Google.Protobuf // TODO: Detect this differently when we have dynamic messages, and put it in one place... if (field.MessageType.IsWellKnownType && field.MessageType.File == Int32Value.Descriptor.File) { - field = field.MessageType.Fields[Wrappers.WrapperValueFieldNumber]; + field = field.MessageType.Fields[WrappersReflection.WrapperValueFieldNumber]; fieldType = field.FieldType; } else |