Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
0475ab72
Kaydet (Commit)
0475ab72
authored
Kas 27, 2015
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Adapt to true wchar_t in clang-cl
Change-Id: I14c2dc0be12151b5d4ea2ba3b65030f6f4494905
üst
9c49ece6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
10 deletions
+20
-10
test_unotype.cxx
cppu/qa/test_unotype.cxx
+14
-7
unotype.hxx
include/cppu/unotype.hxx
+4
-2
ustrbuf.hxx
include/rtl/ustrbuf.hxx
+2
-1
No files found.
cppu/qa/test_unotype.cxx
Dosyayı görüntüle @
0475ab72
...
...
@@ -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
<
...
...
include/cppu/unotype.hxx
Dosyayı görüntüle @
0475ab72
...
...
@@ -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
*
)
{
...
...
include/rtl/ustrbuf.hxx
Dosyayı görüntüle @
0475ab72
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment