Skip to content

C
core
Kaydet (Commit) 0475ab72 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Adapt to true wchar_t in clang-cl 

Change-Id: I14c2dc0be12151b5d4ea2ba3b65030f6f4494905
üst 9c49ece6
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 10 deletions
cppu/qa/test_unotype.cxx
Dosyayı görüntüle @ 0475ab72
...@@ -233,7 +233,8 @@ void Test::testUnoType() { ...@@ -233,7 +233,8 @@ void Test::testUnoType() {
} }
void Test::testGetTypeFavourUnsigned() { 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)); CPPUNIT_ASSERT(typeid(sal_Unicode) == typeid(sal_uInt16));
#else #else
CPPUNIT_ASSERT(typeid(sal_Unicode) != typeid(sal_uInt16)); CPPUNIT_ASSERT(typeid(sal_Unicode) != typeid(sal_uInt16));
...@@ -281,7 +282,8 @@ void Test::testGetTypeFavourUnsigned() { ...@@ -281,7 +282,8 @@ void Test::testGetTypeFavourUnsigned() {
CPPUNIT_ASSERT_EQUAL( CPPUNIT_ASSERT_EQUAL(
cppu::getTypeFavourUnsigned(static_cast<cppu::UnoCharType *>(nullptr)), cppu::getTypeFavourUnsigned(static_cast<cppu::UnoCharType *>(nullptr)),
cppu::UnoType<cppu::UnoCharType>::get()); 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( CPPUNIT_ASSERT_EQUAL(
cppu::getTypeFavourUnsigned(static_cast<sal_Unicode *>(nullptr)), cppu::getTypeFavourUnsigned(static_cast<sal_Unicode *>(nullptr)),
cppu::UnoType<cppu::UnoUnsignedShortType>::get()); cppu::UnoType<cppu::UnoUnsignedShortType>::get());
...@@ -326,7 +328,8 @@ void Test::testGetTypeFavourUnsigned() { ...@@ -326,7 +328,8 @@ void Test::testGetTypeFavourUnsigned() {
cppu::UnoType< cppu::UnoType<
cppu::UnoSequenceType< cppu::UnoSequenceType<
cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>>::get()); 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( CPPUNIT_ASSERT_EQUAL(
cppu::getTypeFavourUnsigned( cppu::getTypeFavourUnsigned(
static_cast<css::uno::Sequence<sal_Unicode> *>(nullptr)), static_cast<css::uno::Sequence<sal_Unicode> *>(nullptr)),
...@@ -424,7 +427,8 @@ void Test::testGetTypeFavourUnsigned() { ...@@ -424,7 +427,8 @@ void Test::testGetTypeFavourUnsigned() {
} }
void Test::testGetTypeFavourChar() { 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)); CPPUNIT_ASSERT(typeid(sal_Unicode) == typeid(sal_uInt16));
#else #else
CPPUNIT_ASSERT(typeid(sal_Unicode) != typeid(sal_uInt16)); CPPUNIT_ASSERT(typeid(sal_Unicode) != typeid(sal_uInt16));
...@@ -448,7 +452,8 @@ void Test::testGetTypeFavourChar() { ...@@ -448,7 +452,8 @@ void Test::testGetTypeFavourChar() {
cppu::getTypeFavourChar( cppu::getTypeFavourChar(
static_cast<cppu::UnoUnsignedShortType *>(nullptr)), static_cast<cppu::UnoUnsignedShortType *>(nullptr)),
cppu::UnoType<cppu::UnoUnsignedShortType>::get()); 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( CPPUNIT_ASSERT_EQUAL(
cppu::getTypeFavourChar(static_cast<sal_uInt16 *>(nullptr)), cppu::getTypeFavourChar(static_cast<sal_uInt16 *>(nullptr)),
cppu::UnoType<cppu::UnoCharType>::get()); cppu::UnoType<cppu::UnoCharType>::get());
...@@ -496,7 +501,8 @@ void Test::testGetTypeFavourChar() { ...@@ -496,7 +501,8 @@ void Test::testGetTypeFavourChar() {
cppu::UnoSequenceType<cppu::UnoUnsignedShortType> *>(nullptr)), cppu::UnoSequenceType<cppu::UnoUnsignedShortType> *>(nullptr)),
cppu::UnoType< cppu::UnoType<
cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>::get()); 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( CPPUNIT_ASSERT_EQUAL(
cppu::getTypeFavourChar( cppu::getTypeFavourChar(
static_cast<css::uno::Sequence<sal_uInt16> *>(nullptr)), static_cast<css::uno::Sequence<sal_uInt16> *>(nullptr)),
...@@ -517,7 +523,8 @@ void Test::testGetTypeFavourChar() { ...@@ -517,7 +523,8 @@ void Test::testGetTypeFavourChar() {
cppu::UnoType< cppu::UnoType<
cppu::UnoSequenceType< cppu::UnoSequenceType<
cppu::UnoSequenceType<cppu::UnoUnsignedShortType>>>::get()); 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( CPPUNIT_ASSERT_EQUAL(
cppu::getTypeFavourChar( cppu::getTypeFavourChar(
static_cast< static_cast<
......
include/cppu/unotype.hxx
Dosyayı görüntüle @ 0475ab72
...@@ -149,7 +149,8 @@ cppu_detail_getUnoType( ...@@ -149,7 +149,8 @@ cppu_detail_getUnoType(
::typelib_TypeClass_UNSIGNED_SHORT); ::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 // cf. sal/types.h sal_Unicode
inline css::uno::Type const & inline css::uno::Type const &
cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_uInt16 const *) { cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_uInt16 const *) {
...@@ -194,7 +195,8 @@ cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::cppu::UnoCharType const *) { ...@@ -194,7 +195,8 @@ cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::cppu::UnoCharType const *) {
return ::cppu::detail::getTypeFromTypeClass(::typelib_TypeClass_CHAR); 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 // cf. sal/types.h sal_Unicode
inline css::uno::Type const & inline css::uno::Type const &
cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_Unicode const *) { cppu_detail_getUnoType(SAL_UNUSED_PARAMETER sal_Unicode const *) {
......
include/rtl/ustrbuf.hxx
Dosyayı görüntüle @ 0475ab72
...@@ -638,7 +638,8 @@ public: ...@@ -638,7 +638,8 @@ public:
return append( &c, 1 ); 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 // cf. sal/types.h sal_Unicode
void append(sal_uInt16) = delete; void append(sal_uInt16) = delete;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment