mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt to true wchar_t in clang-cl

Browse Source 
Change-Id: I14c2dc0be12151b5d4ea2ba3b65030f6f4494905
This commit is contained in:
Stephan Bergmann
2015-11-27 09:43:27 +01:00
parent 9c49ece604
commit 0475ab7208
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cppu/qa/test_unotype.cxx
View File

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

6
include/cppu/unotype.hxx
View File

@@ -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 *) {

3
include/rtl/ustrbuf.hxx
View File

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