mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-02-23 02:57:09 +01:00
Merge pull request #5651 from donny-dont/check-for-filesystem
Use feature macro and VC++ compiler version macro to check for support of filesystem
This commit is contained in:
commit
94218ff782
@ -2,7 +2,7 @@
|
||||
|
||||
#include <vcpkg/base/expected.h>
|
||||
|
||||
#if defined(_WIN32)
|
||||
#if defined(_WIN32) || defined(__cpp_lib_filesystem)
|
||||
#include <filesystem>
|
||||
#else
|
||||
#include <experimental/filesystem>
|
||||
@ -10,7 +10,12 @@
|
||||
|
||||
namespace fs
|
||||
{
|
||||
// VS2015 (_MSC_VER 1900) uses std::experimental::filesystem
|
||||
#if (defined(_MSC_VER) && _MSC_VER > 1900) || defined(__cpp_lib_filesystem)
|
||||
namespace stdfs = std::filesystem;
|
||||
#else
|
||||
namespace stdfs = std::experimental::filesystem;
|
||||
#endif
|
||||
|
||||
using stdfs::copy_options;
|
||||
using stdfs::file_status;
|
||||
|
Loading…
x
Reference in New Issue
Block a user