windows: shim in linb.any due to no support for std.any.

* some sort of bug exists where MSVC's 'std.any' is not importable into swift, due to its modulemap specifying 'requires cplusplus17' even though we are using 'cxxLanguageStandard: .cxx17'. Signed-off-by: furby™ <devs@wabi.foundation>
wabiverse · Nov 1, 2024 · 958eedf · 958eedf
1 parent 42a1283
commit 958eedf
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/Sources/Tf/diagnosticMgr.cpp b/Sources/Tf/diagnosticMgr.cpp
@@ -28,7 +28,17 @@
 #include <signal.h>
 #include <stdlib.h>
 
-#include <any>
+#if defined(_WIN32) || defined(__ANDROID__)
+# include <any/any.hpp>
+
+namespace std
+{
+  using namespace linb;
+}
+#else // !defined(_WIN32) && !defined(__ANDROID__)
+# include <any>
+#endif // defined(_WIN32) || defined(__ANDROID__)
+
 #include <memory>
 #include <thread>
 

diff --git a/Sources/Tf/include/Tf/diagnosticBase.h b/Sources/Tf/include/Tf/diagnosticBase.h
@@ -21,7 +21,17 @@
 #include "Arch/function.h"
 #include "Arch/inttypes.h"
 
-#include <any>
+#if defined(_WIN32) || defined(__ANDROID__)
+# include <any/any.hpp>
+
+namespace std
+{
+  using namespace linb;
+}
+#else // !defined(_WIN32) && !defined(__ANDROID__)
+# include <any>
+#endif // defined(_WIN32) || defined(__ANDROID__)
+
 #include <cstdarg>
 #include <string>
 

diff --git a/Sources/Tf/include/Tf/diagnosticHelper.h b/Sources/Tf/include/Tf/diagnosticHelper.h
@@ -16,7 +16,17 @@
 // incompatible macro definitions in pyport.h on macOS.
 #include <locale>
 
-#include <any>
+#if defined(_WIN32) || defined(__ANDROID__)
+# include <any/any.hpp>
+
+namespace std
+{
+  using namespace linb;
+}
+#else // !defined(_WIN32) && !defined(__ANDROID__)
+# include <any>
+#endif // defined(_WIN32) || defined(__ANDROID__)
+
 #include <string>
 
 // Follow up changes should more tightly scope these to just where it's needed