fix: Automatic detection of <filesystem> header (#684)

boostorg · Jun 25, 2022 · b9e652d · b9e652d
1 parent 526c898
commit b9e652d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/include/boost/gil/io/detail/filesystem.hpp b/include/boost/gil/io/detail/filesystem.hpp
@@ -10,16 +10,16 @@
 
 #include <boost/config.hpp>
 
-#if !defined(BOOST_GIL_IO_USE_BOOST_FILESYSTEM)
-#if !defined(BOOST_NO_CXX17_HDR_FILESYSTEM) || defined(__cpp_lib_filesystem)
+#if !defined(BOOST_GIL_IO_USE_BOOST_FILESYSTEM) && !defined(BOOST_NO_CXX17_HDR_FILESYSTEM)
+#if defined(__cpp_lib_filesystem)
 #include <filesystem>
 #define BOOST_GIL_IO_USE_STD_FILESYSTEM
 #elif defined(__cpp_lib_experimental_filesystem)
 #include <experimental/filesystem>
 #define BOOST_GIL_IO_USE_STD_FILESYSTEM
 #define BOOST_GIL_IO_USE_STD_EXPERIMENTAL_FILESYSTEM
 #endif
-#endif // !BOOST_GIL_IO_USE_BOOST_FILESYSTEM
+#endif // !BOOST_GIL_IO_USE_BOOST_FILESYSTEM && !BOOST_NO_CXX17_HDR_FILESYSTEM
 
 #if !defined(BOOST_GIL_IO_USE_STD_FILESYSTEM)
 // Disable warning: conversion to 'std::atomic<int>::__integral_type {aka int}' from 'long int' may alter its value