api: fix MSVC compatibility of strings

julelang · Aug 3, 2024 · 90fdfe7 · 90fdfe7
1 parent 4071df3
commit 90fdfe7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/api/impl_flag.hpp b/api/impl_flag.hpp
@@ -25,4 +25,8 @@
 #define __JULE_INLINE_BEFORE_CPP20 inline
 #endif
 
+#if defined(_MSC_VER)
+#define __JULE_COMPILER_MSVC
+#endif
+
 #endif // ifndef __JULE_IMPL_FLAG_HPP
diff --git a/api/str.hpp b/api/str.hpp
@@ -74,7 +74,13 @@ namespace jule
 
         Str(void) : _len(0) {};
         Str(const jule::Str &src) = default;
+
+#if defined(__JULE_COMPILER_MSVC)
+        Str(const std::basic_string<jule::U8> &src) : Str(src.begin()->base(), src.end()->base()) {}
+#else
         Str(const std::basic_string<jule::U8> &src) : Str(src.begin().base(), src.end().base()) {}
+#endif
+
         Str(const char *src, const jule::Int &len) : Str(reinterpret_cast<const jule::U8 *>(src), len) {}
         Str(const jule::U8 *src, const jule::Int &len) : buffer(jule::Str::buffer_t::make(const_cast<jule::U8 *>(src), nullptr)),
                                                          _slice(const_cast<jule::U8 *>(src)),