diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-03-13 04:37:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 04:37:22 -0700 |
| commit | 94218ff78217a1bf66619f03de6731c959514ef2 (patch) | |
| tree | 1db588f341fae1e85ee150f777aae18e4f6c5774 | |
| parent | 7d10f758d3b2dedf58920a93758440191a554656 (diff) | |
| parent | 61922f919fca03ebd554a0ab9a26dffead947250 (diff) | |
| download | vcpkg-94218ff78217a1bf66619f03de6731c959514ef2.tar.gz vcpkg-94218ff78217a1bf66619f03de6731c959514ef2.zip | |
Merge pull request #5651 from donny-dont/check-for-filesystem
Use feature macro and VC++ compiler version macro to check for support of filesystem
| -rw-r--r-- | toolsrc/include/vcpkg/base/files.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h index b07ff25b3..b24778308 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) +#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; |