diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-27 09:43:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-28 08:44:52 +0100 |
| commit | 0475ab72081016c8a651b9fc6cdbccc31c718cb6 (patch) | |
| tree | ab314b377fa233b9fbacb2e910bb187e7bcc89ff /cppu/qa | |
| parent | 9c49ece604ae70a166fa032397fe5c904283c8a7 (diff) | |
Adapt to true wchar_t in clang-cl
Change-Id: I14c2dc0be12151b5d4ea2ba3b65030f6f4494905
Diffstat (limited to 'cppu/qa')
| -rw-r--r-- | cppu/qa/test_unotype.cxx | 21 |
1 files changed, 14 insertions, 7 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< |