mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-20 07:05:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5765 from Microsoft/revert-5651-check-for-filesystem

Browse Source 
Revert "Use feature macro to check for support of filesystem"
This commit is contained in:
Griffin Downs 2019-03-21 14:52:06 -07:00 committed by GitHub
commit dc970afe34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolsrc/include/vcpkg/base/files.h
View File

@ -2,7 +2,7 @@
#include <vcpkg/base/expected.h>
#if defined(_WIN32) || defined(__cpp_lib_filesystem)
#if defined(_WIN32)
#include <filesystem>
#else
#include <experimental/filesystem>
@ -10,12 +10,7 @@
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;