GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-06-04 11:13:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #70, fix for missed issue and mingw errors

Browse Source
This commit is contained in:
Steffen Schuemann 2020-10-05 21:59:29 +02:00
parent 56b5e7a174
commit f15dea9695
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/ghc/filesystem.hpp
View File

@ -184,7 +184,7 @@
// * else result of element wise comparison of path iteration where first comparison is != 0 or 0 // * else result of element wise comparison of path iteration where first comparison is != 0 or 0
// if all comparisons are 0 (on Windows this implementation does case insensitive root_name() // if all comparisons are 0 (on Windows this implementation does case insensitive root_name()
// comparison) // comparison)
// #define LWG_2936_BEHAVIOUR #define LWG_2936_BEHAVIOUR
//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// LWG #2937 enforces that fs::equivalent emits an error, if !fs::exists(p1)||!exists(p2) // LWG #2937 enforces that fs::equivalent emits an error, if !fs::exists(p1)||!exists(p2)
#define LWG_2937_BEHAVIOUR #define LWG_2937_BEHAVIOUR
@ -2719,10 +2719,13 @@ GHC_INLINE int path::compare(const path& p) const noexcept
auto rnl1 = root_name_length(); auto rnl1 = root_name_length();
auto rnl2 = p.root_name_length(); auto rnl2 = p.root_name_length();
auto rnc = detail::compare_simple_insensitive(_path.c_str(), rnl1, p._path.c_str(), rnl2); auto rnc = detail::compare_simple_insensitive(_path.c_str(), rnl1, p._path.c_str(), rnl2);
if(rnc) {
return rnc;
}
auto p1 = _path; auto p1 = _path;
std::replace(p1.begin()+rnl1, p1.end(), '/', '\\'); std::replace(p1.begin()+static_cast<int>(rnl1), p1.end(), '/', '\\');
auto p2 = p._path; auto p2 = p._path;
std::replace(p2.begin()+rnl2, p2.end(), '/', '\\'); std::replace(p2.begin()+static_cast<int>(rnl2), p2.end(), '/', '\\');
return p1.compare(rnl1, std::string::npos, p2, rnl2, std::string::npos); return p1.compare(rnl1, std::string::npos, p2, rnl2, std::string::npos);
#else #else
return _path.compare(p._path); return _path.compare(p._path);

1
test/filesystem_test.cpp
View File

@ -618,6 +618,7 @@ TEST_CASE("30.10.8.4.8 path compare", "[filesystem][path][fs.path.compare]")
#ifdef GHC_OS_WINDOWS #ifdef GHC_OS_WINDOWS
CHECK(fs::path("c:\\a\\b").compare("C:\\a\\b") == 0); CHECK(fs::path("c:\\a\\b").compare("C:\\a\\b") == 0);
CHECK(fs::path("c:\\a\\b").compare("d:\\a\\b") != 0);
CHECK(fs::path("c:\\a\\b").compare("C:\\A\\b") != 0); CHECK(fs::path("c:\\a\\b").compare("C:\\A\\b") != 0);
#endif #endif