[ox/fs] Fix issues with PassthroughFS Boost port

(synced from ee9cdbe1e7)
2019-07-06 01:47:09 -05:00
parent 27636f3d94
commit 83fbe88757
2 changed files with 14 additions and 3 deletions
@@ -6,7 +6,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#if __has_include(<filesystem>) && defined(OX_USE_STDLIB)
+#if OX_PASSTHROUGHFS_HAS_DEPENDENCIES && defined(OX_USE_STDLIB)

 #include <stdio.h>

@@ -13,12 +13,23 @@
 #include <filesystem>
 #include <string>

-#include "filesystem.hpp"
+#define OX_PASSTHROUGHFS_HAS_DEPENDENCIES
+
+#elif defined(OX_USE_BOOSTFS)
+
+#include <boost/filesystem>
+#include <string>

-#ifdef OX_USE_BOOSTFS
 using std::filesystem = boost::filesystem;
+
+#define OX_PASSTHROUGHFS_HAS_DEPENDENCIES
+
 #endif

+#ifdef OX_PASSTHROUGHFS_HAS_DEPENDENCIES
+
+#include "filesystem.hpp"
+
 namespace ox {

 /**