deprecated GetCurLocMSecs, added GetCurUniUnixMSecs

klemenkenda · Aug 2, 2018 · 7fee062 · 7fee062
1 parent 3cdc23b
commit 7fee062
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/src/glib/base/os.cpp b/src/glib/base/os.cpp
@@ -177,13 +177,13 @@ uint64 TSysTm::GetCurUniMSecs(){
   return UInt64.Val/uint64(10000);
 }
 
-uint64 TSysTm::GetCurLocMSecs(){
-  SYSTEMTIME SysTm; FILETIME FileTm;
-  GetLocalTime(&SysTm);
-  IAssert(SystemTimeToFileTime(&SysTm, &FileTm));
-  TUInt64 UInt64(uint(FileTm.dwHighDateTime), uint(FileTm.dwLowDateTime));
-  return UInt64.Val/uint64(10000);
-}
+// uint64 TSysTm::GetCurLocMSecs(){
+//   SYSTEMTIME SysTm; FILETIME FileTm;
+//   GetLocalTime(&SysTm);
+//   IAssert(SystemTimeToFileTime(&SysTm, &FileTm));
+//   TUInt64 UInt64(uint(FileTm.dwHighDateTime), uint(FileTm.dwLowDateTime));
+//   return UInt64.Val/uint64(10000);
+// }
 
 uint64 TSysTm::GetMSecsFromTm(const TTm& Tm){
   SYSTEMTIME SysTm; FILETIME FileTm;
@@ -634,9 +634,9 @@ uint64 TSysTm::GetCurUniMSecs(){
   return TSysTm::GetMSecsFromTm(GetCurLocTm());
 }
 
-uint64 TSysTm::GetCurLocMSecs(){
-  return TSysTm::GetMSecsFromTm(GetCurUniTm());
-}
+// uint64 TSysTm::GetCurLocMSecs(){
+//   return TSysTm::GetMSecsFromTm(GetCurUniTm());
+// }
 
 uint64 TSysTm::GetMSecsFromTm(const TTm& Tm){
   time_t t;

diff --git a/src/glib/base/os.h b/src/glib/base/os.h
@@ -108,7 +108,7 @@ class TSysTm{
   static TTm GetCurUniTm();
   static TTm GetCurLocTm();
   static uint64 GetCurUniMSecs();
-  static uint64 GetCurLocMSecs();
+  // static uint64 GetCurLocMSecs(); // deprecated
   static uint64 GetMSecsFromTm(const TTm& Tm);
   static TTm GetTmFromMSecs(const uint64& MSecs);
   static uint GetMSecsFromOsStart();
@@ -228,7 +228,7 @@ class TSysTm{
   static TTm GetCurUniTm();
   static TTm GetCurLocTm();
   static uint64 GetCurUniMSecs();
-  static uint64 GetCurLocMSecs();
+  //static uint64 GetCurLocMSecs(); // deprecated
   static uint64 GetMSecsFromTm(const TTm& Tm);
   static TTm GetTmFromMSecs(const uint64& MSecs);
   static uint GetMSecsFromOsStart();

diff --git a/src/glib/base/tm.cpp b/src/glib/base/tm.cpp
@@ -1093,10 +1093,14 @@ uint64 TTm::GetCurUniMSecs(){
   return TSysTm::GetCurUniMSecs();
 }
 
-uint64 TTm::GetCurLocMSecs(){
-  return TSysTm::GetCurLocMSecs();
+uint64 TTm::GetCurUniUnixMSecs(){
+  return TTm::GetUnixMSecsFromWinMSecs(TTm::GetCurUniMSecs());
 }
 
+// uint64 TTm::GetCurLocMSecs(){
+//   return TSysTm::GetCurLocMSecs();
+// }
+
 uint64 TTm::GetMSecsFromTm(const TTm& Tm){
   return TSysTm::GetMSecsFromTm(Tm);
 }

diff --git a/src/glib/base/tm.h b/src/glib/base/tm.h
@@ -320,7 +320,8 @@ class TTm{
   static TTm GetUniqueCurUniTm(const int& UniqueSpaces, const int& UniqueSpaceN);
   static TTm GetCurLocTm();
   static uint64 GetCurUniMSecs();
-  static uint64 GetCurLocMSecs();
+  static int64 GetCurUniUnixMSecs(); //< Number of milliseconds since 1970-01-01T00:00:00 (UTC)
+  //static uint64 GetCurLocMSecs(); // Deprecated
   static uint64 GetMSecsFromTm(const TTm& Tm);
   static TTm GetTmFromMSecs(const uint64& MSecs);
   static uint GetMSecsFromOsStart();