diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-03-21 14:52:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-21 14:52:06 -0700 |
| commit | dc970afe341ef37877a3b8481ffc75dd54e07575 (patch) | |
| tree | b5ee54a831c5deb7d98fd81ef8adc48457617cd1 | |
| parent | b5ae25cf3d1e8c28095f5379f18f1a47390b33a0 (diff) | |
| parent | c63e466dd6d5beac1e0119211ec5a182c5ea8cbc (diff) | |
| download | vcpkg-dc970afe341ef37877a3b8481ffc75dd54e07575.tar.gz vcpkg-dc970afe341ef37877a3b8481ffc75dd54e07575.zip | |
Merge pull request #5765 from Microsoft/revert-5651-check-for-filesystem
Revert "Use feature macro to check for support of filesystem"
| -rw-r--r-- | toolsrc/include/vcpkg/base/files.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h index b24778308..b07ff25b3 100644 --- a/toolsrc/include/vcpkg/base/files.h +++ b/toolsrc/include/vcpkg/base/files.h @@ -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; |