From e00aef6621f274e5c628a616991871161c19e25e Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 13 Oct 2013 19:20:26 +1300 Subject: [PATCH] -Fixed build warnings --- Src/Newtonsoft.Json/JsonWriter.cs | 2 +- Src/Newtonsoft.Json/MemberSerialization.cs | 8 +++++--- Src/Newtonsoft.Json/Utilities/LinqBridge.cs | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Src/Newtonsoft.Json/JsonWriter.cs b/Src/Newtonsoft.Json/JsonWriter.cs index 0bf09e94..ce444d0d 100644 --- a/Src/Newtonsoft.Json/JsonWriter.cs +++ b/Src/Newtonsoft.Json/JsonWriter.cs @@ -1408,13 +1408,13 @@ namespace Newtonsoft.Json object convertedValue = convertable.ToType(resolvedType, CultureInfo.InvariantCulture); WriteValue(writer, resolvedTypeCode, convertedValue); + break; } else #endif { throw CreateUnsupportedTypeException(writer, value); } - break; } } diff --git a/Src/Newtonsoft.Json/MemberSerialization.cs b/Src/Newtonsoft.Json/MemberSerialization.cs index e6c932f7..b4dcf2cd 100644 --- a/Src/Newtonsoft.Json/MemberSerialization.cs +++ b/Src/Newtonsoft.Json/MemberSerialization.cs @@ -34,8 +34,9 @@ namespace Newtonsoft.Json /// public enum MemberSerialization { +#pragma warning disable 1584,1711,1572,1581,1580,1574 /// - /// All public members are serialized by default. Members can be excluded using or NonSerializedAttribute. + /// All public members are serialized by default. Members can be excluded using or . /// This is the default member serialization mode. /// OptOut, @@ -45,10 +46,11 @@ namespace Newtonsoft.Json /// OptIn, /// - /// All public and private fields are serialized. Members can be excluded using or NonSerializedAttribute. - /// This member serialization mode can also be set by marking the class with SerializableAttribute + /// All public and private fields are serialized. Members can be excluded using or . + /// This member serialization mode can also be set by marking the class with /// and setting IgnoreSerializableAttribute on to false. /// Fields +#pragma warning restore 1584,1711,1572,1581,1580,1574 } } \ No newline at end of file diff --git a/Src/Newtonsoft.Json/Utilities/LinqBridge.cs b/Src/Newtonsoft.Json/Utilities/LinqBridge.cs index 85070fb4..f5e2d299 100644 --- a/Src/Newtonsoft.Json/Utilities/LinqBridge.cs +++ b/Src/Newtonsoft.Json/Utilities/LinqBridge.cs @@ -2974,6 +2974,7 @@ namespace Newtonsoft.Json.Utilities.LinqBridge namespace Newtonsoft.Json.Serialization { +#pragma warning disable 1591 public delegate TResult Func(); public delegate TResult Func(T a); @@ -2991,6 +2992,7 @@ namespace Newtonsoft.Json.Serialization public delegate void Action(T1 arg1, T2 arg2, T3 arg3); public delegate void Action(T1 arg1, T2 arg2, T3 arg3, T4 arg4); +#pragma warning restore 1591 } namespace System.Runtime.CompilerServices