Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- attempt to fix in debian experiemntal gcc

This commit is contained in:
SoftCoder 2016-07-14 11:03:44 -07:00
parent b71277b304
commit daf1dac128
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/glest_game

@ -1 +1 @@
Subproject commit c0c270c5e0ae3c419c9b451abe71d5ab5f29a63e
Subproject commit a1e6be21823b1c597129e3c81f4301177c32fba7

4
source/shared_lib/sources/platform/common/platform_common.cpp
View File

@ -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<std::chrono::system_clock> system_time_point;
typedef std::chrono::time_point<std::chrono::system_clock> 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);