From 68d999eb9028d1e1e6a39b52b2c73019420d86ee Mon Sep 17 00:00:00 2001
From: Martin Ridgers <martin.ridgers@epicgames.com>
Date: Wed, 20 Oct 2021 14:44:08 +0200
Subject: Grouped DateTime methods all together

---
 zencore/compactbinary.cpp | 164 +++++++++++++++++++++++-----------------------
 1 file changed, 82 insertions(+), 82 deletions(-)

(limited to 'zencore/compactbinary.cpp')

diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp
index 041ad8861..d7c4c32d0 100644
--- a/zencore/compactbinary.cpp
+++ b/zencore/compactbinary.cpp
@@ -100,88 +100,6 @@ DateTime::Set(int Year, int Month, int Day, int Hour, int Minute, int Second, in
 			Second * TimeSpan::TicksPerSecond + MilliSecond * TimeSpan::TicksPerMillisecond;
 }
 
-void
-TimeSpan::Set(int Days, int Hours, int Minutes, int Seconds, int FractionNano)
-{
-	int64_t TotalTicks = 0;
-
-	TotalTicks += Days * TicksPerDay;
-	TotalTicks += Hours * TicksPerHour;
-	TotalTicks += Minutes * TicksPerMinute;
-	TotalTicks += Seconds * TicksPerSecond;
-	TotalTicks += FractionNano / NanosecondsPerTick;
-
-	Ticks = TotalTicks;
-}
-
-std::string
-TimeSpan::ToString(const char* Format) const
-{
-	using namespace fmt::literals;
-
-	StringBuilder<128> Result;
-
-	Result.Append((int64_t(Ticks) < 0) ? '-' : '+');
-
-	while (*Format != '\0')
-	{
-		if ((*Format == '%') && (*++Format != '\0'))
-		{
-			switch (*Format)
-			{
-				case 'd':
-					Result.Append("{}"_format(GetDays()));
-					break;
-				case 'D':
-					Result.Append("{:08}"_format(GetDays()));
-					break;
-				case 'h':
-					Result.Append("{:02}"_format(GetHours()));
-					break;
-				case 'm':
-					Result.Append("{:02}"_format(GetMinutes()));
-					break;
-				case 's':
-					Result.Append("{:02}"_format(GetSeconds()));
-					break;
-				case 'f':
-					Result.Append("{:03}"_format(GetFractionMilli()));
-					break;
-				case 'u':
-					Result.Append("{:06}"_format(GetFractionMicro()));
-					break;
-				case 't':
-					Result.Append("{:07}"_format(GetFractionTicks()));
-					break;
-				case 'n':
-					Result.Append("{:09}"_format(GetFractionNano()));
-					break;
-				default:
-					Result.Append(*Format);
-			}
-		}
-		else
-		{
-			Result.Append(*Format);
-		}
-
-		++Format;
-	}
-
-	return Result.ToString();
-}
-
-std::string
-TimeSpan::ToString() const
-{
-	if (GetDays() == 0)
-	{
-		return ToString("%h:%m:%s.%f");
-	}
-
-	return ToString("%d.%h:%m:%s.%f");
-}
-
 int
 DateTime::GetYear() const
 {
@@ -347,6 +265,88 @@ DateTime::ToIso8601() const
 	return ToString("%Y-%m-%dT%H:%M:%S.%sZ");
 }
 
+void
+TimeSpan::Set(int Days, int Hours, int Minutes, int Seconds, int FractionNano)
+{
+	int64_t TotalTicks = 0;
+
+	TotalTicks += Days * TicksPerDay;
+	TotalTicks += Hours * TicksPerHour;
+	TotalTicks += Minutes * TicksPerMinute;
+	TotalTicks += Seconds * TicksPerSecond;
+	TotalTicks += FractionNano / NanosecondsPerTick;
+
+	Ticks = TotalTicks;
+}
+
+std::string
+TimeSpan::ToString(const char* Format) const
+{
+	using namespace fmt::literals;
+
+	StringBuilder<128> Result;
+
+	Result.Append((int64_t(Ticks) < 0) ? '-' : '+');
+
+	while (*Format != '\0')
+	{
+		if ((*Format == '%') && (*++Format != '\0'))
+		{
+			switch (*Format)
+			{
+				case 'd':
+					Result.Append("{}"_format(GetDays()));
+					break;
+				case 'D':
+					Result.Append("{:08}"_format(GetDays()));
+					break;
+				case 'h':
+					Result.Append("{:02}"_format(GetHours()));
+					break;
+				case 'm':
+					Result.Append("{:02}"_format(GetMinutes()));
+					break;
+				case 's':
+					Result.Append("{:02}"_format(GetSeconds()));
+					break;
+				case 'f':
+					Result.Append("{:03}"_format(GetFractionMilli()));
+					break;
+				case 'u':
+					Result.Append("{:06}"_format(GetFractionMicro()));
+					break;
+				case 't':
+					Result.Append("{:07}"_format(GetFractionTicks()));
+					break;
+				case 'n':
+					Result.Append("{:09}"_format(GetFractionNano()));
+					break;
+				default:
+					Result.Append(*Format);
+			}
+		}
+		else
+		{
+			Result.Append(*Format);
+		}
+
+		++Format;
+	}
+
+	return Result.ToString();
+}
+
+std::string
+TimeSpan::ToString() const
+{
+	if (GetDays() == 0)
+	{
+		return ToString("%h:%m:%s.%f");
+	}
+
+	return ToString("%d.%h:%m:%s.%f");
+}
+
 StringBuilderBase&
 Guid::ToString(StringBuilderBase& Sb) const
 {
-- 
cgit v1.2.3