diff options
| author | Jon Skeet <skeet@pobox.com> | 2015-11-19 08:48:50 +0000 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2015-11-19 08:48:50 +0000 |
| commit | c581acb562fad93c4eb7b125cc31b64fa6f51868 (patch) | |
| tree | 7a08d3d8a0a5470395a32df8be3d448adcccd955 /csharp/src/Google.Protobuf/JsonParser.cs | |
| parent | 8162451b727e5abd46ea934a81d44c6ff7e0963e (diff) | |
| parent | 284bb452e48a3cf3346f00b0ea5579d8fe854573 (diff) | |
| download | protobuf-c581acb562fad93c4eb7b125cc31b64fa6f51868.tar.gz protobuf-c581acb562fad93c4eb7b125cc31b64fa6f51868.tar.bz2 protobuf-c581acb562fad93c4eb7b125cc31b64fa6f51868.zip | |
Merge pull request #944 from jskeet/umbrella-classname
Change the way the "umbrella class" (descriptors) is named/namespaced
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 |