mirrors/TarsCloud_TarsCpp
1
0
Fork 0
mirror of https://gitee.com/TarsCloud/TarsCpp.git synced 2025-01-05 17:42:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix tc_common time bug in windows

Browse Source
This commit is contained in:
ruanshudong 2021-03-29 10:30:36 +08:00
parent 4ac35f6e7b
commit ffe1b07c01
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util/src/tc_common.cpp
View File

@ -495,7 +495,9 @@ public:
//带时区时间
TC_Port::localtime_r(&secs, &timeinfo);
local_secs = ::mktime(&timeinfo);
#if !TARGET_PLATFORM_WINDOWS
timezone_local = string(timeinfo.tm_zone);
#endif
//不带时区时间
TC_Port::gmtime_r(&secs, &timeinfo);
@ -504,13 +506,17 @@ public:
timezone_diff_secs = local_secs - gmt_secs;
}
#if !TARGET_PLATFORM_WINDOWS
static string timezone_local;
#endif
static int64_t timezone_diff_secs;
};
#if !TARGET_PLATFORM_WINDOWS
string TimezoneHelper::timezone_local;
#endif
int64_t TimezoneHelper::timezone_diff_secs = 0;
@ -560,10 +566,11 @@ void TC_Common::tm2time(const time_t &t, struct tm &tt)
TC_Port::gmtime_r(&localt, &tt);
#if !TARGET_PLATFORM_WINDOWS
static string local_timezone = TimezoneHelper::timezone_local;
tt.tm_zone = const_cast<char *>(local_timezone.c_str());
// tt.tm_zone = TimezoneHelper::timezone_local.c_str();
tt.tm_gmtoff = TimezoneHelper::timezone_diff_secs;
#endif
}
string TC_Common::tm2str(const time_t &t, const string &sFormat)