diff options
| author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-01-12 20:55:47 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-01-12 20:55:47 -0800 |
| commit | 73c003c309235485c0e53f2075242567c88a72bc (patch) | |
| tree | 6cebc5a786a171f341e386a567e9d058354d5c24 /csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs | |
| parent | 937ef23acd2cb7554224b4f9cc33c436e54bddf1 (diff) | |
| parent | 9e4f354f14775061ed098c896170d3a2d01a3895 (diff) | |
| download | protobuf-73c003c309235485c0e53f2075242567c88a72bc.tar.gz protobuf-73c003c309235485c0e53f2075242567c88a72bc.tar.bz2 protobuf-73c003c309235485c0e53f2075242567c88a72bc.zip | |
Merge pull request #1089 from jskeet/map-null
Prohibit null values in maps
Diffstat (limited to 'csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs index d568a811..5cdd43c4 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs @@ -24,9 +24,9 @@ namespace Google.Protobuf.WellKnownTypes { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "Chtnb29nbGUvcHJvdG9idWYvZW1wdHkucHJvdG8SD2dvb2dsZS5wcm90b2J1", - "ZiIHCgVFbXB0eUJNChNjb20uZ29vZ2xlLnByb3RvYnVmQgpFbXB0eVByb3Rv", - "UAGgAQGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNi", - "BnByb3RvMw==")); + "ZiIHCgVFbXB0eUJQChNjb20uZ29vZ2xlLnByb3RvYnVmQgpFbXB0eVByb3Rv", + "UAGgAQH4AQGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlw", + "ZXNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { |