third_party/protobuf/csharp/src/Google.Protobuf/JsonParser.cs - Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/csharp/src/Google.Protobuf/JsonParser.cs

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)

Patch Set: Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/protobuf/csharp/src/Google.Protobuf/JsonParser.cs

diff --git a/third_party/protobuf/csharp/src/Google.Protobuf/JsonParser.cs b/third_party/protobuf/csharp/src/Google.Protobuf/JsonParser.cs

index 6b6f2d9ae25a727b46510543dd82c2667ec88ace..d738ebb04b17449cce9a263a4b267c31c0a2c358 100644

--- a/third_party/protobuf/csharp/src/Google.Protobuf/JsonParser.cs

+++ b/third_party/protobuf/csharp/src/Google.Protobuf/JsonParser.cs

@@ -86,8 +86,7 @@ namespace Google.Protobuf

{ FloatValue.Descriptor.FullName, MergeWrapperField },

{ DoubleValue.Descriptor.FullName, MergeWrapperField },

{ BytesValue.Descriptor.FullName, MergeWrapperField },

- { StringValue.Descriptor.FullName, MergeWrapperField },

- { BoolValue.Descriptor.FullName, MergeWrapperField }

+ { StringValue.Descriptor.FullName, MergeWrapperField }

};

// Convenience method to avoid having to repeat the same code multiple times in the above