-Fixed build warnings

This commit is contained in:
James Newton-King
2013-10-13 19:20:26 +13:00
parent 23afe9a9e3
commit e00aef6621
3 changed files with 8 additions and 4 deletions
+1 -1
View File
@@ -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;
}
}
+5 -3
View File
@@ -34,8 +34,9 @@ namespace Newtonsoft.Json
/// </summary>
public enum MemberSerialization
{
#pragma warning disable 1584,1711,1572,1581,1580,1574
/// <summary>
/// All public members are serialized by default. Members can be excluded using <see cref="JsonIgnoreAttribute"/> or NonSerializedAttribute.
/// All public members are serialized by default. Members can be excluded using <see cref="JsonIgnoreAttribute"/> or <see cref="NonSerializedAttribute"/>.
/// This is the default member serialization mode.
/// </summary>
OptOut,
@@ -45,10 +46,11 @@ namespace Newtonsoft.Json
/// </summary>
OptIn,
/// <summary>
/// All public and private fields are serialized. Members can be excluded using <see cref="JsonIgnoreAttribute"/> 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 <see cref="JsonIgnoreAttribute"/> or <see cref="NonSerializedAttribute"/>.
/// This member serialization mode can also be set by marking the class with <see cref="SerializableAttribute"/>
/// and setting IgnoreSerializableAttribute on <see cref="DefaultContractResolver"/> to false.
/// </summary>
Fields
#pragma warning restore 1584,1711,1572,1581,1580,1574
}
}
@@ -2974,6 +2974,7 @@ namespace Newtonsoft.Json.Utilities.LinqBridge
namespace Newtonsoft.Json.Serialization
{
#pragma warning disable 1591
public delegate TResult Func<TResult>();
public delegate TResult Func<T, TResult>(T a);
@@ -2991,6 +2992,7 @@ namespace Newtonsoft.Json.Serialization
public delegate void Action<T1, T2, T3>(T1 arg1, T2 arg2, T3 arg3);
public delegate void Action<T1, T2, T3, T4>(T1 arg1, T2 arg2, T3 arg3, T4 arg4);
#pragma warning restore 1591
}
namespace System.Runtime.CompilerServices