GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-07-23 19:54:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix file_time_type handling when building against MSVC C++17 std::filesystem, additional test fixes.

Browse Source
This commit is contained in:
Steffen Schuemann 2019-05-07 20:33:56 +02:00
parent 04b6fa278b
commit bc1abfa01e
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/filesystem_test.cpp
View File

@ -105,9 +105,18 @@ using fstream = ghc::filesystem::fstream;
template <typename TP> template <typename TP>
std::time_t to_time_t(TP tp) std::time_t to_time_t(TP tp)
{ {
// Based on trick from: Nico Josuttis, C++17 - The Complete Guide using namespace std::chrono;
std::chrono::system_clock::duration dt = std::chrono::duration_cast<std::chrono::system_clock::duration>(tp - TP::clock::now()); auto sctp = time_point_cast<system_clock::duration>(tp - TP::clock::now() + system_clock::now());
return std::chrono::system_clock::to_time_t(std::chrono::system_clock::now() + dt); return system_clock::to_time_t(sctp);
}
template <typename TP>
TP from_time_t(std::time_t t)
{
using namespace std::chrono;
auto sctp = system_clock::from_time_t(t);
auto tp = time_point_cast<TP::duration>(sctp - system_clock::now() + TP::clock::now());
return tp;
} }
namespace Catch { namespace Catch {
@ -2072,7 +2081,7 @@ static fs::file_time_type timeFromString(const std::string& str)
throw std::exception(); throw std::exception();
} }
#ifdef IS_WCHAR_PATH #ifdef IS_WCHAR_PATH
return fs::file_time_type::min(); return from_time_t<fs::file_time_type>(std::mktime(&tm));
#else #else
return fs::file_time_type::clock::from_time_t(std::mktime(&tm)); return fs::file_time_type::clock::from_time_t(std::mktime(&tm));
#endif #endif
@ -2414,7 +2423,7 @@ TEST_CASE("Windows: Long filename support", "[filesystem][path][fs.path.win.long
{ {
TemporaryDirectory t(TempOpt::change_path); TemporaryDirectory t(TempOpt::change_path);
char c = 'A'; char c = 'A';
fs::path dir = fs::current_path(); fs::path dir = "\\\\?\\" + fs::current_path().u8string();
for (; c <= 'Z'; ++c) { for (; c <= 'Z'; ++c) {
std::string part = std::string(16, c); std::string part = std::string(16, c);
dir /= part; dir /= part;