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 #27, Squashed commit of the following:

Browse Source 
commit aabbf8f3d880dcd0aeaa97f014d91d54dfa24ed4
Author: Steffen Schümann <s.schuemann@pobox.com>
Date:   Sat Sep 21 16:22:25 2019 +0200

    refs #27, ghc::filesystem::path::preferred_seperator fix for VS2015

commit 03b437cefb39746127b34ce6c9d47df7209a27c7
Merge: cbe0c61 589219b
Author: Steffen Schümann <s.schuemann@pobox.com>
Date:   Fri Sep 20 13:42:31 2019 +0200

    Merge branch 'master' into feature-27-mingw-preferred_separator

commit cbe0c61492f3a6817f03343bb16d73211625a9cb
Author: Steffen Schuemann <s.schuemann@pobox.com>
Date:   Sat Aug 24 22:20:10 2019 +0200

    Test for workaround of static constexpr issue
This commit is contained in:
Steffen Schuemann 2019-09-21 16:46:00 +02:00
parent 589219bb0d
commit fbdee68f21
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/ghc/filesystem.hpp
View File

@ -192,24 +192,38 @@ public:
} }
}; };
// 30.10.8 class path template<typename char_type>
class GHC_FS_API_CLASS path class path_helper_base
{ {
public: public:
using value_type = char_type;
#ifdef GHC_OS_WINDOWS #ifdef GHC_OS_WINDOWS
#ifdef GHC_WIN_WSTRING_STRING_TYPE
#define GHC_USE_WCHAR_T
using value_type = std::wstring::value_type;
#else
using value_type = std::string::value_type;
#endif
using string_type = std::basic_string<value_type>;
static constexpr value_type preferred_separator = '\\'; static constexpr value_type preferred_separator = '\\';
#else #else
using value_type = std::string::value_type;
using string_type = std::basic_string<value_type>;
static constexpr value_type preferred_separator = '/'; static constexpr value_type preferred_separator = '/';
#endif #endif
};
template <typename char_type>
constexpr char_type path_helper_base<char_type>::preferred_separator;
// 30.10.8 class path
class GHC_FS_API_CLASS path
#if defined(GHC_OS_WINDOWS) && defined(GHC_WIN_WSTRING_STRING_TYPE)
#define GHC_USE_WCHAR_T
: private path_helper_base<std::wstring::value_type>
{
public:
using path_helper_base<std::wstring::value_type>::value_type;
#else
: private path_helper_base<std::string::value_type>
{
public:
using path_helper_base<std::string::value_type>::value_type;
#endif
using string_type = std::basic_string<value_type>;
using path_helper_base<value_type>::preferred_separator;
// 30.10.10.1 enumeration format // 30.10.10.1 enumeration format
/// The path format in wich the constructor argument is given. /// The path format in wich the constructor argument is given.
enum format { enum format {

9
test/filesystem_test.cpp
View File

@ -345,6 +345,15 @@ TEST_CASE("fs::detail::toUtf8", "[filesystem][fs.detail.utf8]")
} }
#endif #endif
TEST_CASE("30.10.8.1 path::preferred_separator", "[filesystem][path][fs.path.generic]")
{
#ifdef GHC_OS_WINDOWS
CHECK(fs::path::preferred_separator == '\\');
#else
CHECK(fs::path::preferred_separator == '/');
#endif
}
#ifndef GHC_OS_WINDOWS #ifndef GHC_OS_WINDOWS
TEST_CASE("30.10.8.1 path(\"//host\").has_root_name()", "[filesystem][path][fs.path.generic]") TEST_CASE("30.10.8.1 path(\"//host\").has_root_name()", "[filesystem][path][fs.path.generic]")
{ {