Merge pull request #514 from erikaldsund/cpp17_filesystem_usage_fixes

Cpp17 filesystem usage fixes
CrowCpp · Aug 7, 2022 · 87cf68f · 87cf68f
2 parents 6e7f0fb + b127671
commit 87cf68f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/include/crow/settings.h b/include/crow/settings.h
@@ -45,6 +45,9 @@
 #endif
 #if __cplusplus >= 201703L
 #define CROW_CAN_USE_CPP17
+#if defined(__GNUC__) && __GNUC__ < 8
+#define CROW_FILESYSTEM_IS_EXPERIMENTAL
+#endif
 #endif
 
 #if defined(_MSC_VER)

diff --git a/include/crow/utility.h b/include/crow/utility.h
@@ -14,7 +14,7 @@
 
 #include "crow/settings.h"
 
-#ifdef CROW_CAN_USE_CPP17
+#if defined(CROW_CAN_USE_CPP17) && !defined(CROW_FILESYSTEM_IS_EXPERIMENTAL)
 #include <filesystem>
 #endif
 
@@ -801,8 +801,8 @@ namespace crow
 
         inline static std::string join_path(std::string path, const std::string& fname)
         {
-#ifdef CROW_CAN_USE_CPP17
-            return std::filesystem::path(path) / fname;
+#if defined(CROW_CAN_USE_CPP17) && !defined(CROW_FILESYSTEM_IS_EXPERIMENTAL)
+            return (std::filesystem::path(path) / fname).string();
 #else
             if (!(path.back() == '/' || path.back() == '\\'))
                 path += '/';