diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-10-13 13:30:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-10-13 16:33:07 +0200 |
| commit | 282f9206b77a03e1864f2f9d4f9c17086495d447 (patch) | |
| tree | 6b24523136e5db6d69aa81e0ffce95dc4d02a209 | |
| parent | b0496a314b1acee28e22c1029b696cbbc1983853 (diff) | |
At least VS 2022 Preview 17.8.0 Preview 3.0 needs the fix too
...from 3c6de7e20e35e37cbddd2d35e065525616deac00 "Fix build against VS 2022
17.7.5"
Change-Id: I36a7d02959c5ad04781c3d484966727c3283cbbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157932
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -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; |