diff options
| -rw-r--r-- | cppu/qa/test_unotype.cxx | 21 | ||||
| -rw-r--r-- | include/cppu/unotype.hxx | 6 | ||||
| -rw-r--r-- | include/rtl/ustrbuf.hxx | 3 |
3 files changed, 20 insertions, 10 deletions
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx index 338c6f77103f..a0b63fa738fe 100644 --- a/cppu/qa/test_unotype.cxx +++ b/cppu/qa/test_unotype.cxx @@ -233,7 +233,8 @@ void Test::testUnoType() { } void Test::testGetTypeFavourUnsigned() { -#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode +#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__ + // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT(typeid(sal_Unicode) == typeid(sal_uInt16)); #else CPPUNIT_ASSERT(typeid(sal_Unicode) != typeid(sal_uInt16)); @@ -281,7 +282,8 @@ void Test::testGetTypeFavourUnsigned() { CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourUnsigned(static_cast<cppu::UnoCharType *>(nullptr)), cppu::UnoType<cppu::UnoCharType>::get()); -#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode +#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__ + // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourUnsigned(static_cast<sal_Unicode *>(nullptr)), cppu::UnoType<cppu::UnoUnsignedShortType>::get()); @@ -326,7 +328,8 @@ void Test::testGetTypeFavourUnsigned() { cppu::UnoType< cppu::UnoSequenceType< cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>>::get()); -#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode +#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__ + // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourUnsigned( static_cast<css::uno::Sequence<sal_Unicode> *>(nullptr)), @@ -424,7 +427,8 @@ void Test::testGetTypeFavourUnsigned() { } void Test::testGetTypeFavourChar() { -#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode +#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__ + // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT(typeid(sal_Unicode) == typeid(sal_uInt16)); #else CPPUNIT_ASSERT(typeid(sal_Unicode) != typeid(sal_uInt16)); @@ -448,7 +452,8 @@ void Test::testGetTypeFavourChar() { cppu::getTypeFavourChar( static_cast<cppu::UnoUnsignedShortType *>(nullptr)), cppu::UnoType<cppu::UnoUnsignedShortType>::get()); -#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode +#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__ + // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourChar(static_cast<sal_uInt16 *>(nullptr)), cppu::UnoType<cppu::UnoCharType>::get()); @@ -496,7 +501,8 @@ void Test::testGetTypeFavourChar() { cppu::UnoSequenceType<cppu::UnoUnsignedShortType> *>(nullptr)), cppu::UnoType< cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>::get()); -#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode +#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__ + // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourChar( static_cast<css::uno::Sequence<sal_uInt16> *>(nullptr)), @@ -517,7 +523,8 @@ void Test::testGetTypeFavourChar() { cppu::UnoType< cppu::UnoSequenceType< cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>>::get()); -#if defined SAL_W32 && !defined __MINGW32__ // cf. sal/types.h sal_Unicode +#if defined SAL_W32 && !defined __MINGW32__ && !defined __clang__ + // cf. sal/types.h sal_Unicode CPPUNIT_ASSERT_EQUAL( cppu::getTypeFavourChar( static_cast< diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx index a59445043735..a4d75011163d 100644 --- a/include/cppu/unotype.hxx +++ b/include/cppu/unotype.hxx @@ -149,7 +149,8 @@ cppu_detail_getUnoType( ::typelib_TypeClass_UNSIGNED_SHORT); } -#if LIBO_INTERNAL_ONLY && (!defined SAL_W32 || defined __MINGW32__) +#if LIBO_INTERNAL_ONLY \ + && (!defined SAL_W32 || defined __MINGW32__ || defined __clang__) // cf. sal/types.h sal_Unicode inline css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_uInt16 const *) { @@ -194,7 +195,8 @@ cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::cppu::UnoCharType const *) { return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_CHAR); } -#if LIBO_INTERNAL_ONLY && (!defined SAL_W32 || defined __MINGW32__) +#if LIBO_INTERNAL_ONLY \ + && (!defined SAL_W32 || defined __MINGW32__ || defined __clang__) // cf. sal/types.h sal_Unicode inline css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_Unicode const *) { diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx index f8dda00538a0..1b1067977a38 100644 --- a/include/rtl/ustrbuf.hxx +++ b/include/rtl/ustrbuf.hxx @@ -638,7 +638,8 @@ public: return append( &c, 1 ); } -#if LIBO_INTERNAL_ONLY && (!defined SAL_W32 || defined __MINGW32__) +#if LIBO_INTERNAL_ONLY && \ + (!defined SAL_W32 || defined __MINGW32__ || defined __clang__) // cf. sal/types.h sal_Unicode void append(sal_uInt16) = delete; #endif |