[Libreoffice-commits] .: 2 commits - cppu/qa cppu/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Mon Dec 19 02:33:47 PST 2011
cppu/qa/cppumaker/test_cppumaker.cxx | 12 +++---
cppu/qa/test_unotype.cxx | 60 +++++++++++++++++----------------
cppu/source/threadpool/threadident.cxx | 6 +--
cppu/source/threadpool/threadpool.cxx | 14 +++----
cppu/source/uno/lbmap.cxx | 4 +-
5 files changed, 49 insertions(+), 47 deletions(-)
New commits:
commit 2af1a97346d3e4c5009e7c76eecb2ea69458c577
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Dec 19 11:32:43 2011 +0100
Removed superfluous CPPU_DLLPUBLIC from definitions.
diff --git a/cppu/source/threadpool/threadident.cxx b/cppu/source/threadpool/threadident.cxx
index c190572..f863f28 100644
--- a/cppu/source/threadpool/threadident.cxx
+++ b/cppu/source/threadpool/threadident.cxx
@@ -60,7 +60,7 @@ static inline void createLocalId( sal_Sequence **ppThreadId )
}
-extern "C" CPPU_DLLPUBLIC void SAL_CALL
+extern "C" void SAL_CALL
uno_getIdOfCurrentThread( sal_Sequence **ppThreadId )
SAL_THROW_EXTERN_C()
{
@@ -92,7 +92,7 @@ uno_getIdOfCurrentThread( sal_Sequence **ppThreadId )
}
-extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_releaseIdFromCurrentThread()
+extern "C" void SAL_CALL uno_releaseIdFromCurrentThread()
SAL_THROW_EXTERN_C()
{
IdContainer *p = getIdContainer();
@@ -106,7 +106,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL uno_releaseIdFromCurrentThread()
}
}
-extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId )
+extern "C" sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId )
SAL_THROW_EXTERN_C()
{
IdContainer *p = getIdContainer();
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index fe10947..312fd89 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -412,7 +412,7 @@ struct _uno_ThreadPool
sal_Int32 dummy;
};
-extern "C" CPPU_DLLPUBLIC uno_ThreadPool SAL_CALL
+extern "C" uno_ThreadPool SAL_CALL
uno_threadpool_create() SAL_THROW_EXTERN_C()
{
MutexGuard guard( Mutex::getGlobalMutex() );
@@ -427,7 +427,7 @@ uno_threadpool_create() SAL_THROW_EXTERN_C()
return h;
}
-extern "C" CPPU_DLLPUBLIC void SAL_CALL
+extern "C" void SAL_CALL
uno_threadpool_attach( uno_ThreadPool ) SAL_THROW_EXTERN_C()
{
sal_Sequence *pThreadId = 0;
@@ -437,7 +437,7 @@ uno_threadpool_attach( uno_ThreadPool ) SAL_THROW_EXTERN_C()
uno_releaseIdFromCurrentThread();
}
-extern "C" CPPU_DLLPUBLIC void SAL_CALL
+extern "C" void SAL_CALL
uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob )
SAL_THROW_EXTERN_C()
{
@@ -452,13 +452,13 @@ uno_threadpool_enter( uno_ThreadPool hPool , void **ppJob )
uno_releaseIdFromCurrentThread();
}
-extern "C" CPPU_DLLPUBLIC void SAL_CALL
+extern "C" void SAL_CALL
uno_threadpool_detach( uno_ThreadPool ) SAL_THROW_EXTERN_C()
{
// we might do here some tiding up in case a thread called attach but never detach
}
-extern "C" CPPU_DLLPUBLIC void SAL_CALL
+extern "C" void SAL_CALL
uno_threadpool_putJob(
uno_ThreadPool,
sal_Sequence *pThreadId,
@@ -469,7 +469,7 @@ uno_threadpool_putJob(
ThreadPool::getInstance()->addJob( pThreadId, bIsOneway, pJob ,doRequest );
}
-extern "C" CPPU_DLLPUBLIC void SAL_CALL
+extern "C" void SAL_CALL
uno_threadpool_dispose( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C()
{
ThreadPool::getInstance()->dispose(
@@ -477,7 +477,7 @@ uno_threadpool_dispose( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C()
reinterpret_cast< sal_IntPtr >(hPool)) );
}
-extern "C" CPPU_DLLPUBLIC void SAL_CALL
+extern "C" void SAL_CALL
uno_threadpool_destroy( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C()
{
ThreadPool::getInstance()->stopDisposing(
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 6df9818..41add2c 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -509,7 +509,7 @@ using namespace ::cppu;
extern "C"
{
//##################################################################################################
-CPPU_DLLPUBLIC void SAL_CALL uno_getMapping(
+void SAL_CALL uno_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo,
rtl_uString * pAddPurpose )
SAL_THROW_EXTERN_C()
@@ -577,7 +577,7 @@ CPPU_DLLPUBLIC void SAL_CALL uno_getMapping(
}
}
//##################################################################################################
-CPPU_DLLPUBLIC void SAL_CALL uno_getMappingByName(
+void SAL_CALL uno_getMappingByName(
uno_Mapping ** ppMapping, rtl_uString * pFrom, rtl_uString * pTo,
rtl_uString * pAddPurpose )
SAL_THROW_EXTERN_C()
commit 63141d21b1a540819b9a2e80b13c77a20efbda1e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Dec 19 11:32:08 2011 +0100
-Werror=sign-promo fixes
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index 19c4894..3770cb3 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -453,17 +453,17 @@ void Test::testBigStruct() {
CPPUNIT_ASSERT_EQUAL(guard.p->m11, static_cast< sal_Unicode >(0));
CPPUNIT_ASSERT_EQUAL(guard.p->m12.getLength(), static_cast< sal_Int32 >(0));
CPPUNIT_ASSERT_EQUAL(
- guard.p->m13.getTypeClass(), com::sun::star::uno::TypeClass_VOID);
+ +guard.p->m13.getTypeClass(), +com::sun::star::uno::TypeClass_VOID);
CPPUNIT_ASSERT_EQUAL(guard.p->m14.hasValue(), sal_False);
CPPUNIT_ASSERT_EQUAL(guard.p->m15.getLength(), static_cast< sal_Int32 >(0));
CPPUNIT_ASSERT_EQUAL(
- guard.p->m16, test::codemaker::cppumaker::HelperEnum_ZERO);
+ +guard.p->m16, +test::codemaker::cppumaker::HelperEnum_ZERO);
CPPUNIT_ASSERT_EQUAL(guard.p->m17.m1, sal_False);
CPPUNIT_ASSERT_EQUAL(guard.p->m17.m2.is(), sal_False);
CPPUNIT_ASSERT_EQUAL(guard.p->m18.is(), sal_False);
CPPUNIT_ASSERT_EQUAL(guard.p->m19, static_cast< sal_Int8 >(0));
CPPUNIT_ASSERT_EQUAL(
- guard.p->m20, test::codemaker::cppumaker::HelperEnum_ZERO);
+ +guard.p->m20, +test::codemaker::cppumaker::HelperEnum_ZERO);
CPPUNIT_ASSERT_EQUAL(guard.p->m21.getLength(), static_cast< sal_Int32 >(0));
CPPUNIT_ASSERT_EQUAL(guard.p->m22.getLength(), static_cast< sal_Int32 >(0));
CPPUNIT_ASSERT_EQUAL(guard.p->m23.getLength(), static_cast< sal_Int32 >(0));
@@ -488,11 +488,11 @@ void Test::testBigStruct() {
typelib_typedescription_complete(&td);
fprintf(stdout, "#### 1\n");
CPPUNIT_ASSERT(td != NULL);
- CPPUNIT_ASSERT_EQUAL(typelib_TypeClass_STRUCT, td->eTypeClass);
+ CPPUNIT_ASSERT_EQUAL(+typelib_TypeClass_STRUCT, +td->eTypeClass);
typelib_StructTypeDescription * std =
reinterpret_cast< typelib_StructTypeDescription * >(td);
- CPPUNIT_ASSERT_EQUAL(typelib_TypeClass_UNSIGNED_SHORT, std->aBase.ppTypeRefs[3]->eTypeClass); // unsigned short m4;
- CPPUNIT_ASSERT_EQUAL(typelib_TypeClass_CHAR, std->aBase.ppTypeRefs[10]->eTypeClass); // char m11;
+ CPPUNIT_ASSERT_EQUAL(+typelib_TypeClass_UNSIGNED_SHORT, +std->aBase.ppTypeRefs[3]->eTypeClass); // unsigned short m4;
+ CPPUNIT_ASSERT_EQUAL(+typelib_TypeClass_CHAR, +std->aBase.ppTypeRefs[10]->eTypeClass); // char m11;
}
void Test::testPolyStruct() {
diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx
index da74c62..157cfcb 100644
--- a/cppu/qa/test_unotype.cxx
+++ b/cppu/qa/test_unotype.cxx
@@ -96,74 +96,76 @@ public:
void Test::testUnoType() {
css::uno::Type t;
t = ::cppu::UnoType< ::cppu::UnoVoidType >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_VOID, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_VOID, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("void")), t.getTypeName());
t = ::cppu::UnoType< bool >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_BOOLEAN, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_BOOLEAN, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("boolean")),
t.getTypeName());
CPPUNIT_ASSERT(::cppu::UnoType< ::sal_Bool >::get() == t);
t = ::cppu::UnoType< ::sal_Int8 >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_BYTE, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_BYTE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("byte")), t.getTypeName());
t = ::cppu::UnoType< ::sal_Int16 >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SHORT, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SHORT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("short")), t.getTypeName());
t = ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_UNSIGNED_SHORT, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(
+ +css::uno::TypeClass_UNSIGNED_SHORT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned short")),
t.getTypeName());
t = ::cppu::UnoType< ::sal_Int32 >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_LONG, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_LONG, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("long")), t.getTypeName());
t = ::cppu::UnoType< ::sal_uInt32 >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_UNSIGNED_LONG, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_UNSIGNED_LONG, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned long")),
t.getTypeName());
t = ::cppu::UnoType< ::sal_Int64 >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_HYPER, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_HYPER, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hyper")), t.getTypeName());
t = ::cppu::UnoType< ::sal_uInt64 >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_UNSIGNED_HYPER, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(
+ +css::uno::TypeClass_UNSIGNED_HYPER, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unsigned hyper")),
t.getTypeName());
t = ::cppu::UnoType< float >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_FLOAT, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_FLOAT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("float")), t.getTypeName());
t = ::cppu::UnoType< double >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_DOUBLE, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_DOUBLE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("double")),
t.getTypeName());
t = ::cppu::UnoType< ::cppu::UnoCharType >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_CHAR, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_CHAR, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("char")), t.getTypeName());
t = ::cppu::UnoType< ::rtl::OUString >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_STRING, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRING, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("string")),
t.getTypeName());
t = ::cppu::UnoType< css::uno::Type >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_TYPE, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_TYPE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("type")), t.getTypeName());
t = ::cppu::UnoType< css::uno::Any >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_ANY, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_ANY, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("any")), t.getTypeName());
t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::sal_Int8 > >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]byte")),
t.getTypeName());
@@ -171,19 +173,19 @@ void Test::testUnoType() {
::cppu::UnoType< css::uno::Sequence< ::sal_Int8 > >::get() == t);
t = ::cppu::UnoType<
::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]unsigned short")),
t.getTypeName());
t = ::cppu::UnoType<
::cppu::UnoSequenceType< ::cppu::UnoCharType > >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[]char")),
t.getTypeName());
t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
::sal_Int8 > > >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]byte")),
t.getTypeName());
@@ -192,31 +194,31 @@ void Test::testUnoType() {
css::uno::Sequence< css::uno::Sequence< ::sal_Int8 > > >::get() == t);
t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
::cppu::UnoUnsignedShortType > > >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]unsigned short")),
t.getTypeName());
t = ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType<
::cppu::UnoCharType > > >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_SEQUENCE, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_SEQUENCE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[][]char")),
t.getTypeName());
t = ::cppu::UnoType< css::uno::TypeClass >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_ENUM, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_ENUM, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.TypeClass")),
t.getTypeName());
t = ::cppu::UnoType< css::lang::EventObject >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_STRUCT, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.EventObject")),
t.getTypeName());
CPPUNIT_ASSERT(::cppu::UnoType< DerivedStruct1 >::get() == t);
t = ::cppu::UnoType< css::beans::PropertyChangeEvent >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_STRUCT, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
@@ -226,20 +228,20 @@ void Test::testUnoType() {
CPPUNIT_ASSERT(::cppu::UnoType< DerivedStruct2 >::get() == t);
#endif
t = ::cppu::UnoType< css::beans::Optional< ::sal_Int8 > >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_STRUCT, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_STRUCT, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Optional<byte>")),
t.getTypeName());
t = ::cppu::UnoType< css::uno::Exception >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_EXCEPTION, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_EXCEPTION, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception")),
t.getTypeName());
CPPUNIT_ASSERT(::cppu::UnoType< DerivedException1 >::get() == t);
t = ::cppu::UnoType< css::uno::RuntimeException >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_EXCEPTION, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_EXCEPTION, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException")),
@@ -248,7 +250,7 @@ void Test::testUnoType() {
CPPUNIT_ASSERT(::cppu::UnoType< DerivedException2 >::get() == t);
#endif
t = ::cppu::UnoType< css::uno::XInterface >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_INTERFACE, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_INTERFACE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface")),
@@ -261,7 +263,7 @@ void Test::testUnoType() {
::cppu::UnoType< css::uno::Reference< DerivedInterface1 > >::get() ==
t);
t = ::cppu::UnoType< css::uno::XComponentContext >::get();
- CPPUNIT_ASSERT_EQUAL(css::uno::TypeClass_INTERFACE, t.getTypeClass());
+ CPPUNIT_ASSERT_EQUAL(+css::uno::TypeClass_INTERFACE, +t.getTypeClass());
CPPUNIT_ASSERT_EQUAL(
::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XComponentContext")),
More information about the Libreoffice-commits
mailing list