From c3bf0dc7dcf39306a9858f078c62ae4ce9b91ba3 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Tue, 29 Jan 2019 17:09:45 +0000 Subject: [PATCH] [v1.7.0] Add support for IC880A Board --- litjson/litjson/JsonMapper.cs | 76 +++++++++--------- litjson/litjson/bin/Release/4.7.1/litjson.dll | Bin 51200 -> 51200 bytes mqtt/M2Mqtt/bin/Release/4.7.1/M2Mqtt.dll | Bin 50688 -> 50688 bytes 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/litjson/litjson/JsonMapper.cs b/litjson/litjson/JsonMapper.cs index 511ea40..79ed51b 100644 --- a/litjson/litjson/JsonMapper.cs +++ b/litjson/litjson/JsonMapper.cs @@ -1,22 +1,22 @@ -#region Header -/** - * JsonMapper.cs - * JSON to .Net object and object to JSON conversions. - * - * The authors disclaim copyright to this source code. For more details, see - * the COPYING file included with this distribution. - **/ -#endregion - - -using System; -using System.Collections; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Reflection; - - +#region Header +/** + * JsonMapper.cs + * JSON to .Net object and object to JSON conversions. + * + * The authors disclaim copyright to this source code. For more details, see + * the COPYING file included with this distribution. + **/ +#endregion + + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Reflection; + + namespace LitJson { internal struct PropertyMetadata { public MemberInfo Info; @@ -74,7 +74,7 @@ namespace LitJson { public delegate IJsonWrapper WrapperFactory(); public class JsonMapper { - #region Fields + #region Fields private static readonly Int32 max_nesting_depth; private static readonly IFormatProvider datetime_format; @@ -101,7 +101,7 @@ namespace LitJson { private static readonly Object static_writer_lock = new Object(); #endregion - #region Constructors + #region Constructors static JsonMapper() { max_nesting_depth = 100; @@ -123,9 +123,9 @@ namespace LitJson { RegisterBaseExporters(); RegisterBaseImporters(); } - #endregion + #endregion - #region Private Methods + #region Private Methods private static void AddArrayMetadata(Type type) { if (array_metadata.ContainsKey(type)) { return; @@ -291,15 +291,15 @@ namespace LitJson { Type value_type = underlying_type ?? inst_type; if (reader.Token == JsonToken.Null) { -#if NETSTANDARD1_5 - if (inst_type.IsClass() || underlying_type != null) { - return null; - } -#else +#if NETSTANDARD1_5 + if (inst_type.IsClass() || underlying_type != null) { + return null; + } +#else if (inst_type.IsClass || underlying_type != null) { return null; } -#endif +#endif throw new JsonException(String.Format("Can't assign null to an instance of type {0}", inst_type)); } @@ -339,14 +339,14 @@ namespace LitJson { } // Maybe it's an enum -#if NETSTANDARD1_5 - if (value_type.IsEnum()) - return Enum.ToObject (value_type, reader.Value); -#else +#if NETSTANDARD1_5 + if (value_type.IsEnum()) + return Enum.ToObject (value_type, reader.Value); +#else if (value_type.IsEnum) { return Enum.ToObject(value_type, reader.Value); } -#endif +#endif // Try using an implicit conversion operator MethodInfo conv_op = GetConvOp(value_type, json_type); @@ -529,7 +529,7 @@ namespace LitJson { base_exporters_table[typeof(DateTime)] = delegate (Object obj, JsonWriter writer) { writer.Write(Convert.ToString((DateTime)obj, datetime_format)); - }; + }; base_exporters_table[typeof(TimeSpan)] = delegate (Object obj, JsonWriter writer) { writer.Write(Convert.ToString((TimeSpan)obj, datetime_format)); }; @@ -767,7 +767,7 @@ namespace LitJson { } writer.WriteObjectEnd(); } - #endregion + #endregion public static String ToJson(Object obj) { @@ -853,5 +853,5 @@ namespace LitJson { public static void UnregisterImporters() { custom_importers_table.Clear(); } - } -} + } +} diff --git a/litjson/litjson/bin/Release/4.7.1/litjson.dll b/litjson/litjson/bin/Release/4.7.1/litjson.dll index 343524c4cc7d557d7fcb5bc7ce37b762c5235397..6431e01bba3a42a18e6df77e90787922c7ed8a1b 100644 GIT binary patch delta 88 zcmZpez}zr_c|r$EP)9(_#vXx<0($HA?OVQfuIJLE2kTlN{7u@tW@7^nSbDO-J_&)B s@$2L4R|&u>|ekE0QcM{vj6}9 delta 97 zcmZpez}zr_c|r%vH>=0d8+!yc3V3il_#*UE+_&+F_|FS9Ws5hj+1S7XmY!^|PeMS} z;`E`uKcVikZ?6@d>05eva>PCbp|H&2(!?Bv;F8jm%zOnS14Hx4b^ESuPT0SI0|1qy BEFk~@ diff --git a/mqtt/M2Mqtt/bin/Release/4.7.1/M2Mqtt.dll b/mqtt/M2Mqtt/bin/Release/4.7.1/M2Mqtt.dll index ead6b4ba31fd42224553d533290eb28d738044e9..ce4acd7702446a3d3ba8a3c5181706f0961251c2 100644 GIT binary patch delta 107 zcmZqZVQ%PQp3uP()DaM~vFFD|fmvEPold?rUM-Vz?gtzTj@mqB(-|%ukTe4jFafa) zBLhRlZ6Myuzz`Jd61+3_e9#2xXMUTLe%|MuT=Mk@czJ2=l^EAvjU73Tj%$i1_v}>=3d<}mP0UdUE-6jP%vUfn RFf^aMY45eoQ}*Ss0{~XcFU$Y{