From 795eb4524846be233aa75114d0b2612a75cfd01a Mon Sep 17 00:00:00 2001
From: Don <don.j.olmstead@gmail.com>
Date: Tue, 12 Mar 2019 10:12:18 -0700
Subject: Use feature macro to check for support of filesystem

Rather than defaulting to std::experimental::filesystem in files.h a feature
macro can be used to determine what stdfs uses.
---
 toolsrc/include/vcpkg/base/files.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h
index b07ff25b3..b4171370f 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,11 @@
 
 namespace fs
 {
+#ifdef __cpp_lib_filesystem
+    namespace stdfs = std::filesystem;
+#else
     namespace stdfs = std::experimental::filesystem;
+#endif
 
     using stdfs::copy_options;
     using stdfs::file_status;
-- 
cgit v1.2.3


From 1c879a4b929edcbdffd664277fcea74f74fd3aeb Mon Sep 17 00:00:00 2001
From: Griffin Downs <grdowns@microsoft.com>
Date: Tue, 12 Mar 2019 15:05:49 -0700
Subject: Use identical check when creating namespace alias

---
 toolsrc/include/vcpkg/base/files.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h
index b4171370f..3fdcdaf7b 100644
--- a/toolsrc/include/vcpkg/base/files.h
+++ b/toolsrc/include/vcpkg/base/files.h
@@ -10,7 +10,7 @@
 
 namespace fs
 {
-#ifdef __cpp_lib_filesystem
+#if defined(_WIN32) || defined(__cpp_lib_filesystem)
     namespace stdfs = std::filesystem;
 #else
     namespace stdfs = std::experimental::filesystem;
-- 
cgit v1.2.3


From 61922f919fca03ebd554a0ab9a26dffead947250 Mon Sep 17 00:00:00 2001
From: Griffin Downs <grdowns@microsoft.com>
Date: Tue, 12 Mar 2019 16:46:40 -0700
Subject: Update check for VS2015

---
 toolsrc/include/vcpkg/base/files.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h
index 3fdcdaf7b..b24778308 100644
--- a/toolsrc/include/vcpkg/base/files.h
+++ b/toolsrc/include/vcpkg/base/files.h
@@ -10,7 +10,8 @@
 
 namespace fs
 {
-#if defined(_WIN32) || defined(__cpp_lib_filesystem)
+// 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;
-- 
cgit v1.2.3