diff options
-rw-r--r-- | include/rtl/strbuf.hxx | 2 | ||||
-rw-r--r-- | include/rtl/string.hxx | 2 | ||||
-rw-r--r-- | include/rtl/stringutils.hxx | 3 | ||||
-rw-r--r-- | include/rtl/ustrbuf.hxx | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx index dd4187e30fc3..e4e4eda1fecd 100644 --- a/include/rtl/strbuf.hxx +++ b/include/rtl/strbuf.hxx @@ -122,7 +122,7 @@ public: explicit OStringBuffer(bool) = delete; explicit OStringBuffer(char) = delete; explicit OStringBuffer(wchar_t) = delete; -#if !(defined _MSC_VER && _MSC_VER == 1937 && defined _MANAGED) +#if !(defined _MSC_VER && _MSC_VER >= 1937 && _MSC_VER <= 1938 && defined _MANAGED) explicit OStringBuffer(char8_t) = delete; #endif explicit OStringBuffer(char16_t) = delete; diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx index 566ff7ff4d2c..3482bb833ebd 100644 --- a/include/rtl/string.hxx +++ b/include/rtl/string.hxx @@ -104,7 +104,7 @@ public: } } -#if !(defined _MSC_VER && _MSC_VER == 1937 && defined _MANAGED) +#if !(defined _MSC_VER && _MSC_VER >= 1937 && _MSC_VER <= 1938 && defined _MANAGED) #if HAVE_CPP_CONSTEVAL consteval #else diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx index fa6c82f50d6f..0239505be0d2 100644 --- a/include/rtl/stringutils.hxx +++ b/include/rtl/stringutils.hxx @@ -246,7 +246,8 @@ struct ConstCharArrayDetector< const char[ 1 ], T > }; #endif -#if defined LIBO_INTERNAL_ONLY && !(defined _MSC_VER && _MSC_VER == 1937 && defined _MANAGED) +#if defined LIBO_INTERNAL_ONLY \ + && !(defined _MSC_VER && _MSC_VER >= 1937 && _MSC_VER <= 1938 && defined _MANAGED) template<std::size_t N, typename T> struct ConstCharArrayDetector<char8_t const [N], T> { using Type = T; diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx index a96dac187455..cd868b0c6d7b 100644 --- a/include/rtl/ustrbuf.hxx +++ b/include/rtl/ustrbuf.hxx @@ -124,7 +124,7 @@ public: explicit OUStringBuffer(bool) = delete; explicit OUStringBuffer(char) = delete; explicit OUStringBuffer(wchar_t) = delete; -#if !(defined _MSC_VER && _MSC_VER == 1937 && defined _MANAGED) +#if !(defined _MSC_VER && _MSC_VER >= 1937 && _MSC_VER <= 1938 && defined _MANAGED) explicit OUStringBuffer(char8_t) = delete; #endif explicit OUStringBuffer(char16_t) = delete; |