[Libreoffice-commits] core.git: include/rtl

[Stephan Bergmann (via logerrit)]

 include/rtl/strbuf.hxx      |    2 +-
 include/rtl/string.hxx      |    2 +-
 include/rtl/stringutils.hxx |    2 +-
 include/rtl/ustrbuf.hxx     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 312efd56ea810063848841df951aa13aa5859bbb
Author:     Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Mon Dec 4 13:35:38 2023 +0100
Commit:     Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Mon Dec 4 15:16:23 2023 +0100

    At least VS 2022 Preview 17.9.0 Preview 1.1 needs the fix too
    
    ...from 3c6de7e20e35e37cbddd2d35e065525616deac00 "Fix build against VS 2022
    17.7.5"
    
    Change-Id: I765db22aba2823e6d9a38282ac53e9ba5bcff092
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160309
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>

diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index 56f3e2abcc38..5fa769241444 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 >= 1930 && _MSC_VER <= 1938 && defined 
_MANAGED)
+#if !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1939 && 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 55b83d675d8d..ce683beb5e60 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -102,7 +102,7 @@ public:
         std::copy_n(literal, N, more.buffer);
     }
 
-#if !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1938 && defined 
_MANAGED)
+#if !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1939 && defined 
_MANAGED)
 #if HAVE_CPP_CONSTEVAL
     consteval
 #else
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index 3cd66ee6c146..622542c7dab8 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -247,7 +247,7 @@ struct ConstCharArrayDetector< const char[ 1 ], T >
 #endif
 
 #if defined LIBO_INTERNAL_ONLY \
-    && !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1938 && defined 
_MANAGED)
+    && !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1939 && 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 f41e34aa9d5d..30aa1959a67d 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 >= 1930 && _MSC_VER <= 1938 && defined 
_MANAGED)
+#if !(defined _MSC_VER && _MSC_VER >= 1930 && _MSC_VER <= 1939 && defined 
_MANAGED)
     explicit OUStringBuffer(char8_t) = delete;
 #endif
     explicit OUStringBuffer(char16_t) = delete;