zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-09-18 02:08:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #55 from wbenny/master

Browse Source 
fix /W4 warnings on MSVC
This commit is contained in:
Toru Niina
2019-04-17 13:16:19 +09:00
committed by GitHub
parent 21fd1271d9 ba307003c4
commit 8847cdc0a9
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
toml/datetime.hpp
View File

@@ -25,20 +25,22 @@ inline std::tm localtime_s(const std::time_t* src)
{ {
std::tm dst; std::tm dst;
const auto result = ::localtime_r(src, &dst); const auto result = ::localtime_r(src, &dst);
if(!result) if (!result) { throw std::runtime_error("localtime_r failed."); }
{ return dst;
throw std::runtime_error("localtime_r failed."); }
} #elif _MSC_VER
inline std::tm localtime_s(const std::time_t* src)
{
std::tm dst;
const auto result = ::localtime_s(&dst, src);
if (result) { throw std::runtime_error("localtime_s failed."); }
return dst; return dst;
} }
#else #else
// XXX: On Windows, std::localtime is thread-safe because they uses thread-local
// storage to store the instance of std::tm. On the other platforms, it may not
// be thread-safe.
inline std::tm localtime_s(const std::time_t* src) inline std::tm localtime_s(const std::time_t* src)
{ {
const auto result = std::localtime(src); const auto result = std::localtime(src);
if(!result) {throw std::runtime_error("localtime failed.");} if (!result) { throw std::runtime_error("localtime failed."); }
return *result; return *result;
} }
#endif #endif
@@ -360,12 +362,12 @@ struct local_datetime
// can be used to get millisecond & microsecond information. // can be used to get millisecond & microsecond information.
const auto t_diff = tp - const auto t_diff = tp -
std::chrono::system_clock::from_time_t(std::mktime(&time)); std::chrono::system_clock::from_time_t(std::mktime(&time));
this->time.millisecond = std::chrono::duration_cast< this->time.millisecond = static_cast<std::uint16_t>(
std::chrono::milliseconds>(t_diff).count(); std::chrono::duration_cast<std::chrono::milliseconds>(t_diff).count());
this->time.microsecond = std::chrono::duration_cast< this->time.microsecond = static_cast<std::uint16_t>(
std::chrono::microseconds>(t_diff).count(); std::chrono::duration_cast<std::chrono::microseconds>(t_diff).count());
this->time.nanosecond = std::chrono::duration_cast< this->time.nanosecond = static_cast<std::uint16_t>(
std::chrono::nanoseconds >(t_diff).count(); std::chrono::duration_cast<std::chrono::nanoseconds >(t_diff).count());
} }
explicit local_datetime(const std::time_t t) explicit local_datetime(const std::time_t t)