diff --git a/data/glest_game b/data/glest_game index c0c270c5..a1e6be21 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit c0c270c5e0ae3c419c9b451abe71d5ab5f29a63e +Subproject commit a1e6be21823b1c597129e3c81f4301177c32fba7 diff --git a/source/shared_lib/sources/platform/common/platform_common.cpp b/source/shared_lib/sources/platform/common/platform_common.cpp index d416b0d8..3033b425 100644 --- a/source/shared_lib/sources/platform/common/platform_common.cpp +++ b/source/shared_lib/sources/platform/common/platform_common.cpp @@ -124,7 +124,9 @@ tm threadsafe_localtime(const time_t &time) { // extracting std::time_t from std:chrono for "now" time_t systemtime_now() { #if __cplusplus > 199711L - system_time_point system_now = std::chrono::system_clock::now(); + // typedef std::chrono::time_point system_time_point; + typedef std::chrono::time_point system_time_point_x; + system_time_point_x system_now = std::chrono::system_clock::now(); return std::chrono::system_clock::to_time_t(system_now); #else return time(NULL);