From 559067fb9680bb3b36fa77397d33b2aedd69115e Mon Sep 17 00:00:00 2001 From: Isamu Mogi Date: Tue, 8 Jan 2019 00:06:02 +0900 Subject: [PATCH 1/2] Fix typo and deprecate it --- .../Scripts/Extensions/DateTimeOffsetExtensions.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/VRM/UniJSON/Scripts/Extensions/DateTimeOffsetExtensions.cs b/Assets/VRM/UniJSON/Scripts/Extensions/DateTimeOffsetExtensions.cs index 66c34633a..faed3e4b5 100644 --- a/Assets/VRM/UniJSON/Scripts/Extensions/DateTimeOffsetExtensions.cs +++ b/Assets/VRM/UniJSON/Scripts/Extensions/DateTimeOffsetExtensions.cs @@ -6,15 +6,17 @@ namespace UniJSON public static class DateTimeOffsetExtensions { public const long TicksPerSecond = 10000000; - public readonly static DateTimeOffset EpocTime = new DateTimeOffset(1970, 1, 1, 0, 0, 0, 0, TimeSpan.Zero); + public readonly static DateTimeOffset EpochTime = new DateTimeOffset(1970, 1, 1, 0, 0, 0, 0, TimeSpan.Zero); + [Obsolete("Use EpochTime")] + public readonly static DateTimeOffset EpocTime = EpochTime; #if !NET_4_6 && !NET_STANDARD_2_0 public static long ToUnixTimeSeconds(this DateTimeOffset now) { - if (now < EpocTime) + if (now < EpochTime) { throw new ArgumentOutOfRangeException(); } - return (now - EpocTime).Ticks / TicksPerSecond; + return (now - EpochTime).Ticks / TicksPerSecond; } #endif } From b3446279f2fea0af955de0899e43d2a68a80e586 Mon Sep 17 00:00:00 2001 From: Isamu Mogi Date: Tue, 8 Jan 2019 00:12:40 +0900 Subject: [PATCH 2/2] Use fixed one --- Assets/VRM/UniJSON/Scripts/MsgPack/MsgPackValue.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/VRM/UniJSON/Scripts/MsgPack/MsgPackValue.cs b/Assets/VRM/UniJSON/Scripts/MsgPack/MsgPackValue.cs index 71b647819..b33c2bd5f 100644 --- a/Assets/VRM/UniJSON/Scripts/MsgPack/MsgPackValue.cs +++ b/Assets/VRM/UniJSON/Scripts/MsgPack/MsgPackValue.cs @@ -631,7 +631,7 @@ namespace UniJSON if (GetExtType() == -1) { var unixtime = EndianConverter.NetworkByteDWordToUnsignedNativeByteOrder(GetBody()); - var dt = new DateTimeOffset(unixtime * DateTimeOffsetExtensions.TicksPerSecond + DateTimeOffsetExtensions.EpocTime.Ticks, TimeSpan.Zero); + var dt = new DateTimeOffset(unixtime * DateTimeOffsetExtensions.TicksPerSecond + DateTimeOffsetExtensions.EpochTime.Ticks, TimeSpan.Zero); return GenericCast.Cast(dt); } break;