diff --git a/include/nana/filesystem/filesystem.hpp b/include/nana/filesystem/filesystem.hpp index 4219e449..4b30241b 100644 --- a/include/nana/filesystem/filesystem.hpp +++ b/include/nana/filesystem/filesystem.hpp @@ -585,7 +585,7 @@ namespace std } -#else //#if NANA_USING_NANA_FILESYSTEM +#else // not #if NANA_USING_NANA_FILESYSTEM //Implements the missing functions for various version of experimental/filesystem namespace std { @@ -601,21 +601,21 @@ namespace std path weakly_canonical(const path& p); path weakly_canonical(const path& p, std::error_code& err); #endif - +/* #if defined(NANA_MINGW) // todo ?? bool exists( std::filesystem::file_status s ) noexcept; bool exists( const std::filesystem::path& p ); bool exists( const std::filesystem::path& p, std::error_code& ec ) noexcept; #endif - +*/ //Visual Studio 2017 #if (defined(NANA_USING_STD_EXPERIMENTAL_FILESYSTEM) && defined(_MSC_VER) && (_MSC_VER > 1912)) || \ (!defined(__clang__) && defined(__GNUC__) && (__cplusplus < 201603 || (__GNUC__* 100 + __GNUC_MINOR__ < 801))) path weakly_canonical(const path& p); path weakly_canonical(const path& p, std::error_code& err); #endif - } - } + } // namespace filesystem + } // namespace std #endif //NANA_USING_NANA_FILESYSTEM diff --git a/source/filesystem/filesystem.cpp b/source/filesystem/filesystem.cpp index 1c95f503..3c30047b 100644 --- a/source/filesystem/filesystem.cpp +++ b/source/filesystem/filesystem.cpp @@ -1589,11 +1589,9 @@ namespace std return exists(status(p, ec)); } */ - }//end namespace filesystem -}//end namespace std -#if (defined(NANA_USING_STD_EXPERIMENTAL_FILESYSTEM) && defined(_MSC_VER) && (_MSC_VER > 1912)) || \ - (!defined(__clang__) && defined(__GNUC__) && (__cplusplus < 201603 || (__GNUC__* 100 + __GNUC_MINOR__ < 801))) +#if (defined(NANA_USING_STD_EXPERIMENTAL_FILESYSTEM) && defined(_MSC_VER) && (_MSC_VER > 1912)) || \ + (!defined(__clang__) && defined(__GNUC__) && (__cplusplus < 201603 || (__GNUC__* 100 + __GNUC_MINOR__ < 801))) namespace detail { @@ -1736,9 +1734,9 @@ namespace std { return weakly_canonical(p, &err); } - } - } #endif + }//end namespace filesystem +}//end namespace std #endif //NANA_USING_NANA_FILESYSTEM