fixes #63, Squashed commit of the following:

commit fdcb3ce Author: Steffen Schuemann <[email protected]> Date: Thu Apr 9 12:59:13 2020 +0200 refs #63, fix typo commit a5cadd2 Author: Steffen Schuemann <[email protected]> Date: Thu Apr 9 11:45:36 2020 +0200 refs #63, work on issues with wchar and clang in windows.
gulrak · Apr 10, 2020 · 3f1c185 · 3f1c185
1 parent 9a047b9
commit 3f1c185
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 10 deletions.
diff --git a/include/ghc/filesystem.hpp b/include/ghc/filesystem.hpp
@@ -1676,6 +1676,14 @@ inline path::path(const std::string_view& source, format fmt)
     _path = detail::toUtf8(std::string(source));
     postprocess_path_with_format(_path, fmt);
 }
+#ifdef GHC_USE_WCHAR_T
+template <>
+inline path::path(const std::wstring_view& source, format fmt)
+{
+    _path = detail::toUtf8(std::wstring(source).c_str());
+    postprocess_path_with_format(_path, fmt);
+}
+#endif
 #endif
 
 template <class Source, typename>
@@ -4506,9 +4514,9 @@ GHC_INLINE space_info space(const path& p, std::error_code& ec) noexcept
 {
     ec.clear();
 #ifdef GHC_OS_WINDOWS
-    ULARGE_INTEGER freeBytesAvailableToCaller = {0, 0};
-    ULARGE_INTEGER totalNumberOfBytes = {0, 0};
-    ULARGE_INTEGER totalNumberOfFreeBytes = {0, 0};
+    ULARGE_INTEGER freeBytesAvailableToCaller = {{0, 0}};
+    ULARGE_INTEGER totalNumberOfBytes = {{0, 0}};
+    ULARGE_INTEGER totalNumberOfFreeBytes = {{0, 0}};
     if (!GetDiskFreeSpaceExW(detail::fromUtf8<std::wstring>(p.u8string()).c_str(), &freeBytesAvailableToCaller, &totalNumberOfBytes, &totalNumberOfFreeBytes)) {
         ec = detail::make_system_error();
         return {static_cast<uintmax_t>(-1), static_cast<uintmax_t>(-1), static_cast<uintmax_t>(-1)};

diff --git a/test/filesystem_test.cpp b/test/filesystem_test.cpp
@@ -2628,13 +2628,28 @@ TEST_CASE("30.10.15.39 weakly_canonical", "[filesystem][operations][fs.op.weakly
 TEST_CASE("std::string_view support", "[filesystem][fs.string_view]")
 {
 #if __cpp_lib_string_view
-    std::string p("foo/bar");
-    std::string_view sv(p);
-    CHECK(fs::path(sv, fs::path::format::generic_format).generic_string() == "foo/bar");
-    fs::path p2("fo");
-    p2 += std::string_view("o");
-    CHECK(p2 == "foo");
-    CHECK(p2.compare(std::string_view("foo")) == 0);
+    {
+        std::string p("foo/bar");
+        std::string_view sv(p);
+        CHECK(fs::path(sv, fs::path::format::generic_format).generic_string() == "foo/bar");
+        fs::path p2("fo");
+        p2 += std::string_view("o");
+        CHECK(p2 == "foo");
+        CHECK(p2.compare(std::string_view("foo")) == 0);
+    }
+
+#if defined(IS_WCHAR_PATH) || defined(GHC_USE_WCHAR_T)
+    {
+        std::wstring p(L"foo/bar");
+        std::wstring_view sv(p);
+        CHECK(fs::path(sv, fs::path::format::generic_format).generic_string() == "foo/bar");
+        fs::path p2(L"fo");
+        p2 += std::wstring_view(L"o");
+        CHECK(p2 == "foo");
+        CHECK(p2.compare(std::wstring_view(L"foo")) == 0);
+    }
+#endif
+
 #else
     WARN("std::string_view specific tests are empty without std::string_view.");
 #endif