refs #90, additional compile issue fixes

gulrak · Jan 31, 2021 · 4944a87 · 4944a87
1 parent a7abc2a
commit 4944a87
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/ghc/filesystem.hpp b/include/ghc/filesystem.hpp
@@ -3008,9 +3008,9 @@ GHC_INLINE path::iterator::iterator() {}
 GHC_INLINE path::iterator::iterator(const path& p, const impl_string_type::const_iterator& pos)
     : _first(p._path.begin())
     , _last(p._path.end())
-    , _iter(pos)
     , _prefix(_first + p._prefixLength)
-    , _root(p.has_root_directory() ? _first + p._prefixLength + p.root_name_length() : _last)
+    , _root(p.has_root_directory() ? _first + static_cast<difference_type>(p._prefixLength + p.root_name_length()) : _last)
+    , _iter(pos)
 {
     updateCurrent();
 }

diff --git a/test/filesystem_test.cpp b/test/filesystem_test.cpp
@@ -2798,7 +2798,7 @@ TEST_CASE("Windows: path namespace handling", "[filesystem][path][fs.path.win.na
         {R"(\??\C:\Windows\notepad.exe)", R"(\??\C:\Windows\notepad.exe)", "\\??", "\\??\\", "/??,/,C:,Windows,notepad.exe"},
 #else
         {R"(\\?\C:\Windows\notepad.exe)", R"(\\?\C:\Windows\notepad.exe)", "C:", "C:\\", "//?/,C:,/,Windows,notepad.exe"},
-        {R"(\??\C:\Windows\notepad.exe)", R"(\??\C:\Windows\notepad.exe)", "C:", "C:\\", "/??/,C:,/,Windows,notepad.exe"},
+        {R"(\??\C:\Windows\notepad.exe)", R"(\??\C:\Windows\notepad.exe)", "C:", "C:\\", "/?\?/,C:,/,Windows,notepad.exe"},
 #endif
         {R"(\\.\C:\Windows\notepad.exe)", R"(\\.\C:\Windows\notepad.exe)", "\\\\.", "\\\\.\\", "//.,/,C:,Windows,notepad.exe"},
         {R"(\\?\HarddiskVolume1\Windows\notepad.exe)", R"(\\?\HarddiskVolume1\Windows\notepad.exe)", "\\\\?", "\\\\?\\", "//?,/,HarddiskVolume1,Windows,notepad.exe"},