Fix windows build

JuliaInterop · Dec 12, 2024 · 7d18f58 · 7d18f58
1 parent b36e1e0
commit 7d18f58
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/include/jlcxx/jlcxx_config.hpp b/include/jlcxx/jlcxx_config.hpp
@@ -23,8 +23,13 @@
 #define __JLCXX_STR(x) __JLCXX_STR_HELPER(x)
 #define JLCXX_VERSION_STRING __JLCXX_STR(JLCXX_VERSION_MAJOR) "." __JLCXX_STR(JLCXX_VERSION_MINOR) "." __JLCXX_STR(JLCXX_VERSION_PATCH)
 
-#if defined(__has_include) && !defined(__FreeBSD__) && !defined(JLCXX_FORCE_RANGES_OFF)
-#  if __has_include (<ranges>)
+// Apple Clang doesn't really support ranges fully until __cpp_lib_ranges==202207L (AppleClang 16)
+#if defined(__cpp_lib_ranges) && !defined(JLCXX_FORCE_RANGES_OFF)
+#  if (defined(__clang__) && defined(__apple_build_version__)) || defined _MSC_VER
+#    if __cpp_lib_ranges >= 202207L
+#      define JLCXX_HAS_RANGES
+#    endif
+#  elif __cpp_lib_ranges >= 201911L
 #    define JLCXX_HAS_RANGES
 #  endif
 #endif

diff --git a/src/jlcxx.cpp b/src/jlcxx.cpp
@@ -457,4 +457,16 @@ JLCXX_API void cxxwrap_init(const std::string& envpath)
   }
 }
 
+#ifdef _MSC_VER 
+
+namespace detail
+{
+
+template class BasicArg<false>;
+template class BasicArg<true>;
+
+}
+
+#endif
+
 }