mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix conditional compilations in filesystem

Browse Source
This commit is contained in:
qPCR4vir 2019-12-03 19:10:07 +01:00
parent 2fd8b28d4e
commit 4b7facebdf
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/nana/filesystem/filesystem.hpp
View File

@ -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 //Implements the missing functions for various version of experimental/filesystem
namespace std namespace std
{ {
@ -601,21 +601,21 @@ namespace std
path weakly_canonical(const path& p); path weakly_canonical(const path& p);
path weakly_canonical(const path& p, std::error_code& err); path weakly_canonical(const path& p, std::error_code& err);
#endif #endif
/*
#if defined(NANA_MINGW) // todo ?? #if defined(NANA_MINGW) // todo ??
bool exists( std::filesystem::file_status s ) noexcept; bool exists( std::filesystem::file_status s ) noexcept;
bool exists( const std::filesystem::path& p ); bool exists( const std::filesystem::path& p );
bool exists( const std::filesystem::path& p, std::error_code& ec ) noexcept; bool exists( const std::filesystem::path& p, std::error_code& ec ) noexcept;
#endif #endif
*/
//Visual Studio 2017 //Visual Studio 2017
#if (defined(NANA_USING_STD_EXPERIMENTAL_FILESYSTEM) && defined(_MSC_VER) && (_MSC_VER > 1912)) || \ #if (defined(NANA_USING_STD_EXPERIMENTAL_FILESYSTEM) && defined(_MSC_VER) && (_MSC_VER > 1912)) || \
(!defined(__clang__) && defined(__GNUC__) && (__cplusplus < 201603 || (__GNUC__* 100 + __GNUC_MINOR__ < 801))) (!defined(__clang__) && defined(__GNUC__) && (__cplusplus < 201603 || (__GNUC__* 100 + __GNUC_MINOR__ < 801)))
path weakly_canonical(const path& p); path weakly_canonical(const path& p);
path weakly_canonical(const path& p, std::error_code& err); path weakly_canonical(const path& p, std::error_code& err);
#endif #endif
} } // namespace filesystem
} } // namespace std
#endif //NANA_USING_NANA_FILESYSTEM #endif //NANA_USING_NANA_FILESYSTEM

6
source/filesystem/filesystem.cpp
View File

@ -1589,8 +1589,6 @@ namespace std
return exists(status(p, ec)); return exists(status(p, ec));
} }
*/ */
}//end namespace filesystem
}//end namespace std
#if (defined(NANA_USING_STD_EXPERIMENTAL_FILESYSTEM) && defined(_MSC_VER) && (_MSC_VER > 1912)) || \ #if (defined(NANA_USING_STD_EXPERIMENTAL_FILESYSTEM) && defined(_MSC_VER) && (_MSC_VER > 1912)) || \
(!defined(__clang__) && defined(__GNUC__) && (__cplusplus < 201603 || (__GNUC__* 100 + __GNUC_MINOR__ < 801))) (!defined(__clang__) && defined(__GNUC__) && (__cplusplus < 201603 || (__GNUC__* 100 + __GNUC_MINOR__ < 801)))
@ -1736,9 +1734,9 @@ namespace std
{ {
return weakly_canonical(p, &err); return weakly_canonical(p, &err);
} }
}
}
#endif #endif
}//end namespace filesystem
}//end namespace std
#endif //NANA_USING_NANA_FILESYSTEM #endif //NANA_USING_NANA_FILESYSTEM