diff options
author | Jon Skeet <jonskeet@google.com> | 2015-07-23 15:31:34 +0100 |
---|---|---|
committer | Jon Skeet <jonskeet@google.com> | 2015-07-27 07:47:50 +0100 |
commit | 0dbd5ec80d33ea2a37f5362a24fd72b2c5f51aaa (patch) | |
tree | 87757b73246b762cede87e54620ef78b791f2881 /csharp/src/Google.Protobuf/Collections/MapField.cs | |
parent | edff88886b03055f8dff0c0dad61d9450b59a23e (diff) | |
download | protobuf-0dbd5ec80d33ea2a37f5362a24fd72b2c5f51aaa.tar.gz protobuf-0dbd5ec80d33ea2a37f5362a24fd72b2c5f51aaa.tar.bz2 protobuf-0dbd5ec80d33ea2a37f5362a24fd72b2c5f51aaa.zip |
First attempt at using profile 259 for Google.Protobuf.
This requires .NET 4.5, and there are a few compatibility changes required around reflection.
Creating a PR from this to see how our CI systems handle it. Will want to add more documentation,
validation and probably tests before merging.
This is in aid of issue #590.
Diffstat (limited to 'csharp/src/Google.Protobuf/Collections/MapField.cs')
-rw-r--r-- | csharp/src/Google.Protobuf/Collections/MapField.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf/Collections/MapField.cs b/csharp/src/Google.Protobuf/Collections/MapField.cs index 9ca5104d..68f2f1cc 100644 --- a/csharp/src/Google.Protobuf/Collections/MapField.cs +++ b/csharp/src/Google.Protobuf/Collections/MapField.cs @@ -35,6 +35,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using Google.Protobuf.Compatibility; namespace Google.Protobuf.Collections { @@ -74,7 +75,7 @@ namespace Google.Protobuf.Collections /// <param name="allowNullValues">Whether null values are permitted in the map or not.</param> public MapField(bool allowNullValues) { - if (allowNullValues && typeof(TValue).IsValueType && Nullable.GetUnderlyingType(typeof(TValue)) == null) + if (allowNullValues && typeof(TValue).IsValueType() && Nullable.GetUnderlyingType(typeof(TValue)) == null) { throw new ArgumentException("allowNullValues", "Non-nullable value types do not support null values"); } |