strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

At least VS 2022 Preview 17.8.0 Preview 3.0 needs the fix too

Browse source 
...from 3c6de7e20e "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>
This commit is contained in:
Stephan Bergmann 2023-10-13 13:30:37 +02:00
parent b0496a314b
commit 282f9206b7
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/rtl/strbuf.hxx
View file

@ -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;

2
include/rtl/string.hxx
View file

@ -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

3
include/rtl/stringutils.hxx
View file

@ -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;

2
include/rtl/ustrbuf.hxx
View file

@ -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;