VS2019 std::filesystem name change

VS2019 changed std::experimental::filesystme to std::filesystem so condition on windows on MSC_VER to use a different name. Closes surge-synthesizer#1433
baconpaul · Dec 19, 2019 · 90efc8c · 90efc8c
1 parent a696776
commit 90efc8c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 0 deletions.
diff --git a/src/common/SurgeStorage.h b/src/common/SurgeStorage.h
@@ -30,7 +30,13 @@
 
 #include "Tunings.h"
 
+
+#if WINDOWS && ( _MSC_VER >= 1920 )
+// vs2019
+namespace fs = std::filesystem;
+#else
 namespace fs = std::experimental::filesystem;
+#endif
 
 #if WINDOWS
 #define PATH_SEPARATOR '\\'

diff --git a/src/common/SurgeSynthesizerIO.cpp b/src/common/SurgeSynthesizerIO.cpp
@@ -16,7 +16,12 @@
 #include <iterator>
 #include "UserInteractions.h"
 
+#if WINDOWS && ( _MSC_VER >= 1920 )
+// vs2019
+namespace fs = std::filesystem;
+#else
 namespace fs = std::experimental::filesystem;
+#endif
 
 #if AU
 #include "aulayer.h"

diff --git a/src/common/UserDefaults.cpp b/src/common/UserDefaults.cpp
@@ -17,7 +17,12 @@
 #include <filesystem>
 #endif
 
+#if WINDOWS && ( _MSC_VER >= 1920 )
+// vs2019
+namespace fs = std::filesystem;
+#else
 namespace fs = std::experimental::filesystem;
+#endif
 
 namespace Surge
 {

diff --git a/src/common/WavSupport.cpp b/src/common/WavSupport.cpp
@@ -32,7 +32,12 @@
 #include <filesystem>
 #endif
 
+#if WINDOWS && ( _MSC_VER >= 1920 )
+// vs2019
+namespace fs = std::filesystem;
+#else
 namespace fs = std::experimental::filesystem;
+#endif
 
 // Sigh - lets write a portable ntol by hand
 unsigned int pl_int(char *d)

diff --git a/src/common/gui/COscillatorDisplay.cpp b/src/common/gui/COscillatorDisplay.cpp
@@ -16,7 +16,12 @@
 
 using namespace VSTGUI;
 
+#if WINDOWS && ( _MSC_VER >= 1920 )
+// vs2019
+namespace fs = std::filesystem;
+#else
 namespace fs = std::experimental::filesystem;
+#endif
 
 const float disp_pitch = 90.15f - 48.f;
 const int wtbheight = 12;

diff --git a/src/common/gui/SurgeGUIEditor.cpp b/src/common/gui/SurgeGUIEditor.cpp
@@ -49,7 +49,12 @@
 #include <filesystem>
 #endif
 
+#if WINDOWS && ( _MSC_VER >= 1920 )
+// vs2019
+namespace fs = std::filesystem;
+#else
 namespace fs = std::experimental::filesystem;
+#endif
 
 
 #if LINUX && TARGET_LV2