refs #76, additional support for _MSVC_LANG

gulrak · Oct 25, 2020 · cf78907 · cf78907
1 parent 416c60a
commit cf78907
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/include/ghc/fs_std.hpp b/include/ghc/fs_std.hpp
@@ -30,7 +30,7 @@
 //              namespace fs.
 //---------------------------------------------------------------------------------------
 #ifndef GHC_FILESYSTEM_STD_H
-#if defined(__cplusplus) && __cplusplus >= 201703L && defined(__has_include)
+#if (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || (defined(__cplusplus) && __cplusplus >= 201703L) && defined(__has_include)
 #if __has_include(<filesystem>) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
 #define GHC_USE_STD_FS
 #include <filesystem>

diff --git a/include/ghc/fs_std_fwd.hpp b/include/ghc/fs_std_fwd.hpp
@@ -33,7 +33,7 @@
 //---------------------------------------------------------------------------------------
 #ifndef GHC_FILESYSTEM_STD_FWD_H
 #define GHC_FILESYSTEM_STD_FWD_H
-#if defined(__cplusplus) && __cplusplus >= 201703L && defined(__has_include)
+#if (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || (defined(__cplusplus) && __cplusplus >= 201703L) && defined(__has_include)
 #if __has_include(<filesystem>) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
 #define GHC_USE_STD_FS
 #include <filesystem>

diff --git a/include/ghc/fs_std_impl.hpp b/include/ghc/fs_std_impl.hpp
@@ -31,7 +31,7 @@
 // The cpp has to include this before including fs_std_fwd.hpp directly or via a different
 // header to work.
 //---------------------------------------------------------------------------------------
-#if defined(__cplusplus) && __cplusplus >= 201703L && defined(__has_include)
+#if (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || (defined(__cplusplus) && __cplusplus >= 201703L) && defined(__has_include)
 #if __has_include(<filesystem>) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
 #define GHC_USE_STD_FS
 #endif