fix experimental filesystem namespace issue

david-bro · Jul 22, 2017 · 4d862af · 4d862af
1 parent a7a9c3f
commit 4d862af
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/MavLinkCom/MavLinkTest/Commands.cpp b/MavLinkCom/MavLinkTest/Commands.cpp
@@ -468,7 +468,13 @@ void DumpLogCommandsCommand::Execute(std::shared_ptr<MavLinkVehicle> com)
     unused(com);
 //TODO: make below future proof (i.e. usable by C++17 compiler) - also change same in main.cpp
 #if defined(USE_CPP_FILESYSTEM)
+//can't use experimental stuff on Linux because of potential ABI issues
+#if defined(_WIN32) || ((defined __cplusplus) && (__cplusplus < 201700L))
+    using namespace std::experimental::filesystem;
+#else
     using namespace std::filesystem;
+#endif
+
     path dirPath(log_folder_);
 
     for (directory_iterator next(dirPath), end; next != end; ++next) {

diff --git a/MavLinkCom/MavLinkTest/main.cpp b/MavLinkCom/MavLinkTest/main.cpp
@@ -155,7 +155,12 @@ std::shared_ptr<MavLinkVehicle> mavLinkVehicle;
 
 #if defined(USE_CPP_FILESYSTEM)
 
+//can't use experimental stuff on Linux because of potential ABI issues
+#if defined(_WIN32) || ((defined __cplusplus) && (__cplusplus < 201700L))
+using namespace std::experimental::filesystem;
+#else
 using namespace std::filesystem;
+#endif
 
 void ConvertLogFileToJson(std::string logFile)
 {