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

remove one branch by preprocessor

Browse Source 
since localtime in windows is already thread-safe, there are no need to
change the function.
This commit is contained in:
ToruNiina
2018-12-26 13:38:01 +09:00
parent 825b2c30a1
commit 51dd3abcae
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
toml/datetime.hpp
View File

@@ -19,8 +19,8 @@ namespace toml
// with C11. We need to dispatch the function depending on the OS. // with C11. We need to dispatch the function depending on the OS.
namespace detail namespace detail
{ {
// TODO: find more sophisticated way to handle this
#if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _BSD_SOURCE || _SVID_SOURCE || _POSIX_SOURCE #if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _BSD_SOURCE || _SVID_SOURCE || _POSIX_SOURCE
// use posix.
inline std::tm localtime_s(const std::time_t* src) inline std::tm localtime_s(const std::time_t* src)
{ {
std::tm dst; std::tm dst;
@@ -31,27 +31,14 @@ inline std::tm localtime_s(const std::time_t* src)
} }
return dst; return dst;
} }
#elif defined(_MSC_VER) || defined(_WIN32)
// use windows
inline std::tm localtime_s(const std::time_t* src)
{
std::tm dst;
const auto result = ::localtime_s(&dst, src);
if(result != 0)
{
throw std::runtime_error("localtime_s failed.");
}
return dst;
}
#else #else
//XXX it is **NOT** threadsafe! there seems to be no thread-safe localtime impl. // 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); //XXX not threadsafe!!! const auto result = std::localtime(src);
if(!result) if(!result) {throw std::runtime_error("localtime failed.");}
{
throw std::runtime_error("std::localtime failed.");
}
return *result; return *result;
} }
#endif #endif