diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/rtl/string.hxx | 10 | ||||
| -rw-r--r-- | include/rtl/ustring.hxx | 8 | ||||
| -rw-r--r-- | include/unotools/weakref.hxx | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx index eb7f137a203c..72b046e26a0b 100644 --- a/include/rtl/string.hxx +++ b/include/rtl/string.hxx @@ -186,7 +186,7 @@ private: rtl_String* pData; }; -#if __cplusplus >= 202002L +#if !(defined _MSC_VER && _MSC_VER <= 1929 && defined _MANAGED) namespace detail { @@ -396,7 +396,7 @@ public: /// @endcond #endif -#if defined LIBO_INTERNAL_ONLY && __cplusplus >= 202002L +#if defined LIBO_INTERNAL_ONLY && !(defined _MSC_VER && _MSC_VER <= 1929 && defined _MANAGED) // For operator ""_tstr: template<OStringLiteral L> constexpr OString(detail::OStringHolder<L> const & holder): pData(const_cast<rtl_String *>(&holder.literal.str)) {} @@ -472,12 +472,12 @@ public: /** Release the string data. */ -#if defined LIBO_INTERNAL_ONLY && __cplusplus >= 202002L +#if defined LIBO_INTERNAL_ONLY && !(defined _MSC_VER && _MSC_VER <= 1929 && defined _MANAGED) constexpr #endif ~OString() { -#if defined LIBO_INTERNAL_ONLY && __cplusplus >= 202002L +#if defined LIBO_INTERNAL_ONLY && !(defined _MSC_VER && _MSC_VER <= 1929 && defined _MANAGED) if (std::is_constant_evaluated()) { //TODO: We would want to // @@ -2393,7 +2393,7 @@ using ::rtl::OStringHash; using ::rtl::OStringLiteral; #endif -#if defined LIBO_INTERNAL_ONLY && __cplusplus >= 202002L +#if defined LIBO_INTERNAL_ONLY && !(defined _MSC_VER && _MSC_VER <= 1929 && defined _MANAGED) template< #if defined RTL_STRING_UNITTEST diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx index 34d4fd8f5be5..764ad026bdff 100644 --- a/include/rtl/ustring.hxx +++ b/include/rtl/ustring.hxx @@ -440,7 +440,7 @@ public: /// @endcond #endif -#if defined LIBO_INTERNAL_ONLY && __cplusplus >= 202002L +#if defined LIBO_INTERNAL_ONLY && !(defined _MSC_VER && _MSC_VER <= 1929 && defined _MANAGED) // For operator ""_tstr: template<OStringLiteral L> OUString(detail::OStringHolder<L> const & holder) { pData = nullptr; @@ -545,12 +545,12 @@ public: /** Release the string data. */ -#if defined LIBO_INTERNAL_ONLY && __cplusplus >= 202002L +#if defined LIBO_INTERNAL_ONLY && !(defined _MSC_VER && _MSC_VER <= 1929 && defined _MANAGED) constexpr #endif ~OUString() { -#if defined LIBO_INTERNAL_ONLY && __cplusplus >= 202002L +#if defined LIBO_INTERNAL_ONLY && !(defined _MSC_VER && _MSC_VER <= 1929 && defined _MANAGED) if (std::is_constant_evaluated()) { //TODO: We would want to // @@ -3590,7 +3590,7 @@ using ::rtl::OUStringChar; using ::rtl::Concat2View; #endif -#if defined LIBO_INTERNAL_ONLY && __cplusplus >= 202002L +#if defined LIBO_INTERNAL_ONLY && !(defined _MSC_VER && _MSC_VER <= 1929 && defined _MANAGED) template< #if defined RTL_STRING_UNITTEST diff --git a/include/unotools/weakref.hxx b/include/unotools/weakref.hxx index 14ee6d424f62..0cab7d0e9b2a 100644 --- a/include/unotools/weakref.hxx +++ b/include/unotools/weakref.hxx @@ -115,7 +115,7 @@ public: @return hard reference or null, if the weakly referenced interface has gone */ rtl::Reference<interface_type> SAL_CALL get() const -#if __cplusplus >= 202002L && !(defined __clang__ && __clang_major__ <= 15) +#if !(defined __clang__ && __clang_major__ <= 15) requires(!cppu::detail::isUnoInterfaceType<interface_type>) #endif { |