From d11c3807b32d51e48ed4557972a627f6366956d9 Mon Sep 17 00:00:00 2001
From: Treeston <treeston.mmoc@gmail.com>
Date: Tue, 14 Jul 2020 01:35:25 +0200
Subject: Core/Time: Rename GetGameTime{System, Steady}Point methods

The names are a bit unhandy. Rename them (shorter but still meaningful).

GetGameTimeSystemPoint() -> GetSystemTime()
GetGameTimeSteadyPoint() -> Now()

Also add 2 new typedefs:

typedef std::chrono::steady_clock::time_point TimePoint;
typedef std::chrono::system_clock::time_point SystemTimePoint;

Closes #25042

(cherry picked from commit 896b68d5c297b06587645caebc98b704978ecaa7)
---
 src/server/game/Time/GameTime.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/server/game/Time/GameTime.cpp')

diff --git a/src/server/game/Time/GameTime.cpp b/src/server/game/Time/GameTime.cpp
index 141d353627b..399be3196b3 100644
--- a/src/server/game/Time/GameTime.cpp
+++ b/src/server/game/Time/GameTime.cpp
@@ -26,8 +26,8 @@ namespace GameTime
     time_t GameTime = time(nullptr);
     uint32 GameMSTime = 0;
 
-    std::chrono::system_clock::time_point GameTimeSystemPoint = std::chrono::system_clock::time_point::min();
-    std::chrono::steady_clock::time_point GameTimeSteadyPoint = std::chrono::steady_clock::time_point::min();
+    SystemTimePoint GameTimeSystemPoint = SystemTimePoint::min();
+    TimePoint GameTimeSteadyPoint = TimePoint::min();
 
     tm DateTime;
 
@@ -46,32 +46,32 @@ namespace GameTime
         return GameMSTime;
     }
 
-    std::chrono::system_clock::time_point GetGameTimeSystemPoint()
+    SystemTimePoint GetSystemTime()
     {
         return GameTimeSystemPoint;
     }
 
-    std::chrono::steady_clock::time_point GetGameTimeSteadyPoint()
+    TimePoint Now()
     {
         return GameTimeSteadyPoint;
     }
 
     template<typename Clock>
-    typename Clock::time_point GetGameTimePoint()
+    typename Clock::time_point GetTime()
     {
         static_assert(!std::is_same<Clock, Clock>::value, "Missing specialization for GetGameTimePoint");
     }
 
     template<>
-    TC_GAME_API std::chrono::system_clock::time_point GetGameTimePoint<std::chrono::system_clock>()
+    TC_GAME_API SystemTimePoint GetTime<std::chrono::system_clock>()
     {
-        return GetGameTimeSystemPoint();
+        return GetSystemTime();
     }
 
     template<>
-    TC_GAME_API std::chrono::steady_clock::time_point GetGameTimePoint<std::chrono::steady_clock>()
+    TC_GAME_API TimePoint GetTime<std::chrono::steady_clock>()
     {
-        return GetGameTimeSteadyPoint();
+        return Now();
     }
 
     uint32 GetUptime()
-- 
cgit v1.2.3