diff options
Diffstat (limited to 'cppu')
100 files changed, 1997 insertions, 372 deletions
diff --git a/cppu/inc/com/sun/star/uno/Any.h b/cppu/inc/com/sun/star/uno/Any.h index c9e8aed205e1..eb29273c16aa 100644 --- a/cppu/inc/com/sun/star/uno/Any.h +++ b/cppu/inc/com/sun/star/uno/Any.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -381,3 +382,5 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::su } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/com/sun/star/uno/Any.hxx b/cppu/inc/com/sun/star/uno/Any.hxx index 44508556698c..8ea8c437dde2 100644 --- a/cppu/inc/com/sun/star/uno/Any.hxx +++ b/cppu/inc/com/sun/star/uno/Any.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -234,7 +235,7 @@ inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, { if (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass) { - value = (* reinterpret_cast< const sal_Bool * >( &rAny.pReserved ) != sal_False); + value = (* reinterpret_cast< const sal_Bool * >( rAny.pData ) != sal_False); return sal_True; } return sal_False; @@ -243,7 +244,7 @@ inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, inline sal_Bool SAL_CALL operator == ( const Any & rAny, const sal_Bool & value ) SAL_THROW( () ) { return (typelib_TypeClass_BOOLEAN == rAny.pType->eTypeClass && - (value != sal_False) == (* reinterpret_cast< const sal_Bool * >( &rAny.pReserved ) != sal_False)); + (value != sal_False) == (* reinterpret_cast< const sal_Bool * >( rAny.pData ) != sal_False)); } //______________________________________________________________________________ @@ -254,7 +255,7 @@ inline sal_Bool SAL_CALL operator >>= ( Any const & rAny, bool & value ) if (rAny.pType->eTypeClass == typelib_TypeClass_BOOLEAN) { value = *reinterpret_cast< sal_Bool const * >( - &rAny.pReserved ) != sal_False; + rAny.pData ) != sal_False; return true; } return false; @@ -267,7 +268,7 @@ inline sal_Bool SAL_CALL operator == ( Any const & rAny, bool const & value ) { return (rAny.pType->eTypeClass == typelib_TypeClass_BOOLEAN && (value == - (*reinterpret_cast< sal_Bool const * >( &rAny.pReserved ) + (*reinterpret_cast< sal_Bool const * >( rAny.pData ) != sal_False))); } @@ -277,7 +278,7 @@ inline sal_Bool SAL_CALL operator >>= ( const ::com::sun::star::uno::Any & rAny, { if (typelib_TypeClass_BYTE == rAny.pType->eTypeClass) { - value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int8 * >( rAny.pData ); return sal_True; } return sal_False; @@ -289,11 +290,11 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int16 & value ) SA switch (rAny.pType->eTypeClass) { case typelib_TypeClass_BYTE: - value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int8 * >( rAny.pData ); return sal_True; case typelib_TypeClass_SHORT: case typelib_TypeClass_UNSIGNED_SHORT: - value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int16 * >( rAny.pData ); return sal_True; default: return sal_False; @@ -305,11 +306,11 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt16 & value ) S switch (rAny.pType->eTypeClass) { case typelib_TypeClass_BYTE: - value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int8 * >( rAny.pData ); return sal_True; case typelib_TypeClass_SHORT: case typelib_TypeClass_UNSIGNED_SHORT: - value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData ); return sal_True; default: return sal_False; @@ -322,17 +323,17 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int32 & value ) SA switch (rAny.pType->eTypeClass) { case typelib_TypeClass_BYTE: - value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int8 * >( rAny.pData ); return sal_True; case typelib_TypeClass_SHORT: - value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int16 * >( rAny.pData ); return sal_True; case typelib_TypeClass_UNSIGNED_SHORT: - value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData ); return sal_True; case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: - value = * reinterpret_cast< const sal_Int32 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int32 * >( rAny.pData ); return sal_True; default: return sal_False; @@ -344,17 +345,17 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt32 & value ) S switch (rAny.pType->eTypeClass) { case typelib_TypeClass_BYTE: - value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int8 * >( rAny.pData ); return sal_True; case typelib_TypeClass_SHORT: - value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int16 * >( rAny.pData ); return sal_True; case typelib_TypeClass_UNSIGNED_SHORT: - value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData ); return sal_True; case typelib_TypeClass_LONG: case typelib_TypeClass_UNSIGNED_LONG: - value = * reinterpret_cast< const sal_uInt32 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_uInt32 * >( rAny.pData ); return sal_True; default: return sal_False; @@ -367,26 +368,24 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_Int64 & value ) SA switch (rAny.pType->eTypeClass) { case typelib_TypeClass_BYTE: - value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int8 * >( rAny.pData ); return sal_True; case typelib_TypeClass_SHORT: - value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int16 * >( rAny.pData ); return sal_True; case typelib_TypeClass_UNSIGNED_SHORT: - value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData ); return sal_True; case typelib_TypeClass_LONG: - value = * reinterpret_cast< const sal_Int32 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int32 * >( rAny.pData ); return sal_True; case typelib_TypeClass_UNSIGNED_LONG: - value = * reinterpret_cast< const sal_uInt32 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_uInt32 * >( rAny.pData ); return sal_True; case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: - value = * reinterpret_cast< const sal_Int64 * >( - (sizeof(void *) >= sizeof(sal_Int64)) ? (void *)&rAny.pReserved : rAny.pData ); + value = * reinterpret_cast< const sal_Int64 * >( rAny.pData ); return sal_True; - default: return sal_False; } @@ -397,26 +396,24 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, sal_uInt64 & value ) S switch (rAny.pType->eTypeClass) { case typelib_TypeClass_BYTE: - value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int8 * >( rAny.pData ); return sal_True; case typelib_TypeClass_SHORT: - value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int16 * >( rAny.pData ); return sal_True; case typelib_TypeClass_UNSIGNED_SHORT: - value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData ); return sal_True; case typelib_TypeClass_LONG: - value = * reinterpret_cast< const sal_Int32 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int32 * >( rAny.pData ); return sal_True; case typelib_TypeClass_UNSIGNED_LONG: - value = * reinterpret_cast< const sal_uInt32 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_uInt32 * >( rAny.pData ); return sal_True; case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: - value = * reinterpret_cast< const sal_uInt64 * >( - (sizeof(void *) >= sizeof(sal_uInt64)) ? (void *)&rAny.pReserved : rAny.pData ); + value = * reinterpret_cast< const sal_uInt64 * >( rAny.pData ); return sal_True; - default: return sal_False; } @@ -428,19 +425,17 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, float & value ) SAL_TH switch (rAny.pType->eTypeClass) { case typelib_TypeClass_BYTE: - value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int8 * >( rAny.pData ); return sal_True; case typelib_TypeClass_SHORT: - value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int16 * >( rAny.pData ); return sal_True; case typelib_TypeClass_UNSIGNED_SHORT: - value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData ); return sal_True; case typelib_TypeClass_FLOAT: - value = * reinterpret_cast< const float * >( - (sizeof(void *) >= sizeof(float)) ? (void *)&rAny.pReserved : rAny.pData ); + value = * reinterpret_cast< const float * >( rAny.pData ); return sal_True; - default: return sal_False; } @@ -452,29 +447,26 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, double & value ) SAL_T switch (rAny.pType->eTypeClass) { case typelib_TypeClass_BYTE: - value = * reinterpret_cast< const sal_Int8 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int8 * >( rAny.pData ); return sal_True; case typelib_TypeClass_SHORT: - value = * reinterpret_cast< const sal_Int16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int16 * >( rAny.pData ); return sal_True; case typelib_TypeClass_UNSIGNED_SHORT: - value = * reinterpret_cast< const sal_uInt16 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_uInt16 * >( rAny.pData ); return sal_True; case typelib_TypeClass_LONG: - value = * reinterpret_cast< const sal_Int32 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_Int32 * >( rAny.pData ); return sal_True; case typelib_TypeClass_UNSIGNED_LONG: - value = * reinterpret_cast< const sal_uInt32 * >( &rAny.pReserved ); + value = * reinterpret_cast< const sal_uInt32 * >( rAny.pData ); return sal_True; case typelib_TypeClass_FLOAT: - value = * reinterpret_cast< const float * >( - (sizeof(void *) >= sizeof(float)) ? (void *)&rAny.pReserved : rAny.pData ); + value = * reinterpret_cast< const float * >( rAny.pData ); return sal_True; case typelib_TypeClass_DOUBLE: - value = * reinterpret_cast< const double * >( - (sizeof(void *) >= sizeof(double)) ? (void *)&rAny.pReserved : rAny.pData ); + value = * reinterpret_cast< const double * >( rAny.pData ); return sal_True; - default: return sal_False; } @@ -485,7 +477,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & valu { if (typelib_TypeClass_STRING == rAny.pType->eTypeClass) { - value = * reinterpret_cast< const ::rtl::OUString * >( &rAny.pReserved ); + value = * reinterpret_cast< const ::rtl::OUString * >( rAny.pData ); return sal_True; } return sal_False; @@ -494,7 +486,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, ::rtl::OUString & valu inline sal_Bool SAL_CALL operator == ( const Any & rAny, const ::rtl::OUString & value ) SAL_THROW( () ) { return (typelib_TypeClass_STRING == rAny.pType->eTypeClass && - value.equals( * reinterpret_cast< const ::rtl::OUString * >( &rAny.pReserved ) )); + value.equals( * reinterpret_cast< const ::rtl::OUString * >( rAny.pData ) )); } // type //__________________________________________________________________________________________________ @@ -502,7 +494,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THR { if (typelib_TypeClass_TYPE == rAny.pType->eTypeClass) { - value = * reinterpret_cast< const Type * >( &rAny.pReserved ); + value = * reinterpret_cast< const Type * >( rAny.pData ); return sal_True; } return sal_False; @@ -511,7 +503,7 @@ inline sal_Bool SAL_CALL operator >>= ( const Any & rAny, Type & value ) SAL_THR inline sal_Bool SAL_CALL operator == ( const Any & rAny, const Type & value ) SAL_THROW( () ) { return (typelib_TypeClass_TYPE == rAny.pType->eTypeClass && - value.equals( * reinterpret_cast< const Type * >( &rAny.pReserved ) )); + value.equals( * reinterpret_cast< const Type * >( rAny.pData ) )); } // any //__________________________________________________________________________________________________ @@ -531,7 +523,7 @@ inline sal_Bool SAL_CALL operator == ( const Any & rAny, const BaseReference & v { if (typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass) { - return reinterpret_cast< const BaseReference * >( &rAny.pReserved )->operator == ( value ); + return reinterpret_cast< const BaseReference * >( rAny.pData )->operator == ( value ); } return sal_False; } @@ -587,3 +579,5 @@ sal_uInt16 Any::get<sal_uInt16>() const; } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/com/sun/star/uno/Reference.h b/cppu/inc/com/sun/star/uno/Reference.h index f792556dcb57..071cadcfde7b 100644 --- a/cppu/inc/com/sun/star/uno/Reference.h +++ b/cppu/inc/com/sun/star/uno/Reference.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -239,13 +240,13 @@ class Reference : public BaseReference public: // these are here to force memory de/allocation to sal lib. /** @internal */ - inline static void * SAL_CALL operator new ( size_t nSize ) SAL_THROW( () ) + inline static void * SAL_CALL operator new ( ::size_t nSize ) SAL_THROW( () ) { return ::rtl_allocateMemory( nSize ); } /** @internal */ inline static void SAL_CALL operator delete ( void * pMem ) SAL_THROW( () ) { ::rtl_freeMemory( pMem ); } /** @internal */ - inline static void * SAL_CALL operator new ( size_t, void * pMem ) SAL_THROW( () ) + inline static void * SAL_CALL operator new ( ::size_t, void * pMem ) SAL_THROW( () ) { return pMem; } /** @internal */ inline static void SAL_CALL operator delete ( void *, void * ) SAL_THROW( () ) @@ -531,3 +532,5 @@ inline T * get_pointer( Reference<T> const& r ) } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx b/cppu/inc/com/sun/star/uno/Reference.hxx index 4223cc277c37..39e9614f20d8 100644 --- a/cppu/inc/com/sun/star/uno/Reference.hxx +++ b/cppu/inc/com/sun/star/uno/Reference.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,9 +30,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/RuntimeException.hpp> -#ifndef _COM_SUN_STAR_UNO_XINTERFACE_HDL_ #include <com/sun/star/uno/XInterface.hdl> -#endif #include <com/sun/star/uno/genfunc.hxx> namespace com @@ -429,3 +428,5 @@ inline sal_Bool BaseReference::operator != ( const BaseReference & rRef ) const } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/com/sun/star/uno/Sequence.h b/cppu/inc/com/sun/star/uno/Sequence.h index 71bb42c7413b..68abc9d24748 100644 --- a/cppu/inc/com/sun/star/uno/Sequence.h +++ b/cppu/inc/com/sun/star/uno/Sequence.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,7 +70,7 @@ class Sequence public: // these are here to force memory de/allocation to sal lib. /** @internal */ - inline static void * SAL_CALL operator new ( size_t nSize ) + inline static void * SAL_CALL operator new ( ::size_t nSize ) SAL_THROW( () ) { return ::rtl_allocateMemory( nSize ); } /** @internal */ @@ -77,7 +78,7 @@ public: SAL_THROW( () ) { ::rtl_freeMemory( pMem ); } /** @internal */ - inline static void * SAL_CALL operator new ( size_t, void * pMem ) + inline static void * SAL_CALL operator new ( ::size_t, void * pMem ) SAL_THROW( () ) { return pMem; } /** @internal */ @@ -286,3 +287,5 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCharSequenceCppuType() SAL_THROW( () ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx b/cppu/inc/com/sun/star/uno/Sequence.hxx index bca6a1c44211..8a9b43d1339e 100644 --- a/cppu/inc/com/sun/star/uno/Sequence.hxx +++ b/cppu/inc/com/sun/star/uno/Sequence.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -305,3 +306,5 @@ SAL_CALL getCharSequenceCppuType() SAL_THROW( () ) } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/com/sun/star/uno/Type.h b/cppu/inc/com/sun/star/uno/Type.h index 61829c2c790d..6490fa4ab7f1 100644 --- a/cppu/inc/com/sun/star/uno/Type.h +++ b/cppu/inc/com/sun/star/uno/Type.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -456,3 +457,5 @@ template<> inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType< sal_Unicode >() SAL_THROW(()); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/com/sun/star/uno/Type.hxx b/cppu/inc/com/sun/star/uno/Type.hxx index 33eba298e188..46fd86329424 100644 --- a/cppu/inc/com/sun/star/uno/Type.hxx +++ b/cppu/inc/com/sun/star/uno/Type.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -325,3 +326,5 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType< sal_Unicode >() } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/com/sun/star/uno/genfunc.h b/cppu/inc/com/sun/star/uno/genfunc.h index 41fdebf47a31..1b0dbd2c4cce 100644 --- a/cppu/inc/com/sun/star/uno/genfunc.h +++ b/cppu/inc/com/sun/star/uno/genfunc.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ inline void * SAL_CALL cpp_queryInterface( void * pCppI, typelib_TypeDescription } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/com/sun/star/uno/genfunc.hxx b/cppu/inc/com/sun/star/uno/genfunc.hxx index b2299a35cd3d..88234bd81389 100644 --- a/cppu/inc/com/sun/star/uno/genfunc.hxx +++ b/cppu/inc/com/sun/star/uno/genfunc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ inline void * SAL_CALL cpp_queryInterface( void * pCppI, typelib_TypeDescription } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/cppu/Enterable.hxx b/cppu/inc/cppu/Enterable.hxx index c8bbfb49d382..5ccfb9c4e2fb 100644 --- a/cppu/inc/cppu/Enterable.hxx +++ b/cppu/inc/cppu/Enterable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,16 +51,16 @@ public: virtual void v_callOut_v (uno_EnvCallee * pCallee, va_list * pParam) = 0; virtual int v_isValid (rtl::OUString * pReason) = 0; - virtual ~Enterable() {}; + virtual ~Enterable() {} public: inline explicit Enterable(void); - inline void enter(void) {m_enter(this);}; - inline void leave(void) {m_leave(this);}; + inline void enter(void) {m_enter(this);} + inline void leave(void) {m_leave(this);} - inline void callInto_v(uno_EnvCallee * pCallee, va_list * pParam) {m_callInto_v(this, pCallee, pParam);}; - inline void callOut_v (uno_EnvCallee * pCallee, va_list * pParam) {m_callOut_v (this, pCallee, pParam);}; + inline void callInto_v(uno_EnvCallee * pCallee, va_list * pParam) {m_callInto_v(this, pCallee, pParam);} + inline void callOut_v (uno_EnvCallee * pCallee, va_list * pParam) {m_callOut_v (this, pCallee, pParam);} inline void callInto(uno_EnvCallee * pCallee, ...); inline void callOut (uno_EnvCallee * pCallee, ...); @@ -71,12 +72,12 @@ private: Enterable & operator = (Enterable const &); }; -extern "C" inline void Enterable_call_enter (void * context) { ((Enterable *)context)->v_enter(); }; -extern "C" inline void Enterable_call_leave (void * context) { ((Enterable *)context)->v_leave(); }; +extern "C" inline void Enterable_call_enter (void * context) { ((Enterable *)context)->v_enter(); } +extern "C" inline void Enterable_call_leave (void * context) { ((Enterable *)context)->v_leave(); } extern "C" inline void Enterable_call_callInto_v(void * context, uno_EnvCallee * pCallee, va_list * pParam) - { ((Enterable *)context)->v_callInto_v(pCallee, pParam); }; + { ((Enterable *)context)->v_callInto_v(pCallee, pParam); } extern "C" inline void Enterable_call_callOut_v (void * context, uno_EnvCallee * pCallee, va_list * pParam) - { ((Enterable *)context)->v_callOut_v(pCallee, pParam); }; + { ((Enterable *)context)->v_callOut_v(pCallee, pParam); } extern "C" inline int Enterable_call_isValid (void * context, rtl_uString ** pReason) {return ((Enterable *)context)->v_isValid((rtl::OUString *)pReason);} @@ -112,3 +113,5 @@ void Enterable::callOut(uno_EnvCallee * pCallee, ...) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/cppu/EnvDcp.hxx b/cppu/inc/cppu/EnvDcp.hxx index c4e394b98460..68adf63017c3 100644 --- a/cppu/inc/cppu/EnvDcp.hxx +++ b/cppu/inc/cppu/EnvDcp.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ inline rtl::OUString getPurpose(rtl::OUString const & rEnvDcp) #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/cppu/EnvGuards.hxx b/cppu/inc/cppu/EnvGuards.hxx index c7408f01cfd1..07f65b2aced9 100644 --- a/cppu/inc/cppu/EnvGuards.hxx +++ b/cppu/inc/cppu/EnvGuards.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/cppu/FreeReference.hxx b/cppu/inc/cppu/FreeReference.hxx index e2d60775c0b3..5a8d22175921 100644 --- a/cppu/inc/cppu/FreeReference.hxx +++ b/cppu/inc/cppu/FreeReference.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -164,3 +165,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/cppu/Map.hxx b/cppu/inc/cppu/Map.hxx index 455bee6e5fbd..a5922f830b5d 100644 --- a/cppu/inc/cppu/Map.hxx +++ b/cppu/inc/cppu/Map.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/cppu/Shield.hxx b/cppu/inc/cppu/Shield.hxx index 46cdaeacea06..1e7221a210d3 100644 --- a/cppu/inc/cppu/Shield.hxx +++ b/cppu/inc/cppu/Shield.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,5 @@ namespace cppu } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/cppu/helper/purpenv/Environment.hxx b/cppu/inc/cppu/helper/purpenv/Environment.hxx index ba56c22e53cf..25c9de8e8a6e 100644 --- a/cppu/inc/cppu/helper/purpenv/Environment.hxx +++ b/cppu/inc/cppu/helper/purpenv/Environment.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,5 @@ void Environment_initWithEnterable(uno_Environment * pEnvironment, cppu::Enterab }}} #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/cppu/helper/purpenv/Mapping.hxx b/cppu/inc/cppu/helper/purpenv/Mapping.hxx index c20309e7a180..6bdcd207987f 100644 --- a/cppu/inc/cppu/helper/purpenv/Mapping.hxx +++ b/cppu/inc/cppu/helper/purpenv/Mapping.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,5 @@ void createMapping(uno_Mapping ** ppMapping, }}} #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/cppu/macros.hxx b/cppu/inc/cppu/macros.hxx index fd64d1c767df..5c123e7aecd9 100644 --- a/cppu/inc/cppu/macros.hxx +++ b/cppu/inc/cppu/macros.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,4 @@ #endif // _CPPU_MACROS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/cppu/unotype.hxx b/cppu/inc/cppu/unotype.hxx index bef23d3cf38d..b8df4e07a1b0 100644 --- a/cppu/inc/cppu/unotype.hxx +++ b/cppu/inc/cppu/unotype.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -375,3 +376,5 @@ getTypeFavourChar(::com::sun::star::uno::Sequence< T > const *); } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/pch/precompiled_cppu.cxx b/cppu/inc/pch/precompiled_cppu.cxx index 5148aa6b5439..2a6a6cb94ae0 100644 --- a/cppu/inc/pch/precompiled_cppu.cxx +++ b/cppu/inc/pch/precompiled_cppu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_cppu.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/pch/precompiled_cppu.hxx b/cppu/inc/pch/precompiled_cppu.hxx index 38ea1cc9fbf7..c6624e57b5ca 100644 --- a/cppu/inc/pch/precompiled_cppu.hxx +++ b/cppu/inc/pch/precompiled_cppu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,4 @@ #ifdef PRECOMPILED_HEADERS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/typelib/typeclass.h b/cppu/inc/typelib/typeclass.h index da0ea9f37093..231c9d9f5fe3 100644 --- a/cppu/inc/typelib/typeclass.h +++ b/cppu/inc/typelib/typeclass.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,5 @@ typedef enum _typelib_TypeClass } typelib_TypeClass; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h index cf42acac96b1..a88894c723a7 100644 --- a/cppu/inc/typelib/typedescription.h +++ b/cppu/inc/typelib/typedescription.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,8 +42,6 @@ struct _typelib_TypeDescription; #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 8) #endif /** Holds a weak reference to a type description. @@ -559,7 +558,7 @@ typedef struct _typelib_Union_Init typelib_TypeDescriptionReference* pTypeRef; } typelib_Union_Init; -#if defined( SAL_W32) || defined(SAL_OS2) +#if defined( SAL_W32) #pragma pack(pop) #endif @@ -1158,3 +1157,5 @@ sal_Bool SAL_CALL typelib_typedescription_complete( #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/typelib/typedescription.hxx b/cppu/inc/typelib/typedescription.hxx index 61a6531d3529..3997f3d9c14d 100644 --- a/cppu/inc/typelib/typedescription.hxx +++ b/cppu/inc/typelib/typedescription.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,7 @@ #include <rtl/alloc.h> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Type.h> -#ifndef _TYPELIB_TYPEDESCRIPTION_H #include <typelib/typedescription.h> -#endif namespace com @@ -224,3 +223,5 @@ inline void TypeDescription::makeComplete() const SAL_THROW( () ) } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/typelib/uik.h b/cppu/inc/typelib/uik.h index 06eead24f8bb..f201407d7aa0 100644 --- a/cppu/inc/typelib/uik.h +++ b/cppu/inc/typelib/uik.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,8 +32,6 @@ #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 8) #endif /** Binary typelib uik struct. Internally not used anymore. @@ -46,8 +45,10 @@ typedef struct _typelib_Uik sal_uInt32 m_Data5; } typelib_Uik; -#if defined( SAL_W32) || defined(SAL_OS2) +#if defined( SAL_W32) # pragma pack(pop) #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/Enterable.h b/cppu/inc/uno/Enterable.h index d92013ec1404..a769ede987f2 100644 --- a/cppu/inc/uno/Enterable.h +++ b/cppu/inc/uno/Enterable.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,5 @@ uno_Enterable; #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/EnvDcp.h b/cppu/inc/uno/EnvDcp.h index 17d65bc57d9c..a2471815c179 100644 --- a/cppu/inc/uno/EnvDcp.h +++ b/cppu/inc/uno/EnvDcp.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ void uno_EnvDcp_getPurpose (rtl_uString const * pEnvDcp, rtl_uString ** ppEnvPur #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/any2.h b/cppu/inc/uno/any2.h index 72af895115b3..dbf64181002e 100644 --- a/cppu/inc/uno/any2.h +++ b/cppu/inc/uno/any2.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,8 +38,6 @@ extern "C" #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 8) #endif struct _typelib_TypeDescriptionReference; @@ -62,7 +61,7 @@ typedef struct _uno_Any void * pReserved; } uno_Any; -#if defined( SAL_W32) || defined(SAL_OS2) +#if defined( SAL_W32) #pragma pack(pop) #endif @@ -176,3 +175,5 @@ void SAL_CALL uno_any_clear( #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/cuno.h b/cppu/inc/uno/cuno.h index dfe5edea7144..f71c56854dd1 100644 --- a/cppu/inc/uno/cuno.h +++ b/cppu/inc/uno/cuno.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,9 +43,10 @@ @param return_code return code of call */ -#define CUNO_EXCEPTION_OCCURED( return_code ) (0 != ((return_code) & CUNO_ERROR_EXCEPTION)) +#define CUNO_EXCEPTION_OCCURRED( return_code ) (0 != ((return_code) & CUNO_ERROR_EXCEPTION)) typedef sal_Int32 cuno_ErrorCode; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/current_context.h b/cppu/inc/uno/current_context.h index 64edd60a4811..7abd2771df07 100644 --- a/cppu/inc/uno/current_context.h +++ b/cppu/inc/uno/current_context.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,5 @@ sal_Bool SAL_CALL uno_setCurrentContext( #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/current_context.hxx b/cppu/inc/uno/current_context.hxx index 6cce6bc347a2..01d59a460eca 100644 --- a/cppu/inc/uno/current_context.hxx +++ b/cppu/inc/uno/current_context.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,5 @@ inline ContextLayer::~ContextLayer() } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/data.h b/cppu/inc/uno/data.h index 31c3d57f3544..8a86b89841d7 100644 --- a/cppu/inc/uno/data.h +++ b/cppu/inc/uno/data.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -255,3 +256,5 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData( #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/dispatcher.h b/cppu/inc/uno/dispatcher.h index 55475868fd24..297dece16003 100644 --- a/cppu/inc/uno/dispatcher.h +++ b/cppu/inc/uno/dispatcher.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,8 +64,6 @@ typedef void (SAL_CALL * uno_DispatchMethod)( #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 8) #endif /** The binary C uno interface description. @@ -86,7 +85,7 @@ typedef struct _uno_Interface uno_DispatchMethod pDispatcher; } uno_Interface; -#if defined( SAL_W32) || defined(SAL_OS2) +#if defined( SAL_W32) #pragma pack(pop) #endif @@ -95,3 +94,5 @@ typedef struct _uno_Interface #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/dispatcher.hxx b/cppu/inc/uno/dispatcher.hxx index a4a845fc738f..90fdb3db6df7 100644 --- a/cppu/inc/uno/dispatcher.hxx +++ b/cppu/inc/uno/dispatcher.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -173,3 +174,4 @@ inline void UnoInterfaceReference::dispatch( #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/environment.h b/cppu/inc/uno/environment.h index f959aa2571f4..81c0b179ea7b 100644 --- a/cppu/inc/uno/environment.h +++ b/cppu/inc/uno/environment.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,8 +43,6 @@ struct _typelib_InterfaceTypeDescription; #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 8) #endif /** The binary specification of an UNO environment. @@ -255,7 +254,7 @@ typedef struct _uno_ExtEnvironment } uno_ExtEnvironment; -#if defined( SAL_W32) || defined(SAL_OS2) +#if defined( SAL_W32) #pragma pack(pop) #endif @@ -383,3 +382,5 @@ int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pRea #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/environment.hxx b/cppu/inc/uno/environment.hxx index c204b0a2dfa0..8fa4f3ea5063 100644 --- a/cppu/inc/uno/environment.hxx +++ b/cppu/inc/uno/environment.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -276,3 +277,5 @@ inline Environment Environment::getCurrent(rtl::OUString const & typeName) SAL_T } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/lbnames.h b/cppu/inc/uno/lbnames.h index 4bca6a8a9dd5..f9e32a957312 100644 --- a/cppu/inc/uno/lbnames.h +++ b/cppu/inc/uno/lbnames.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ provoking error here, because PP ignores #error #define UNO_LB_CLI "cli" #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/mapping.h b/cppu/inc/uno/mapping.h index 3254d3c7c47d..53ea250dd31d 100644 --- a/cppu/inc/uno/mapping.h +++ b/cppu/inc/uno/mapping.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,8 +66,6 @@ typedef void (SAL_CALL * uno_MapInterfaceFunc)( #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 8) #endif /** This is the binary specification of a mapping. @@ -86,7 +85,7 @@ typedef struct _uno_Mapping uno_MapInterfaceFunc mapInterface; } uno_Mapping; -#if defined( SAL_W32) || defined(SAL_OS2) +#if defined( SAL_W32) #pragma pack(pop) #endif @@ -201,3 +200,5 @@ typedef void (SAL_CALL * uno_ext_getMappingFunc)( #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/mapping.hxx b/cppu/inc/uno/mapping.hxx index 2bd669133670..a183cf089de3 100644 --- a/cppu/inc/uno/mapping.hxx +++ b/cppu/inc/uno/mapping.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -352,3 +353,5 @@ inline sal_Bool mapToUno( uno_Interface ** ppRet, const Reference< C > & x ) SAL } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/sequence2.h b/cppu/inc/uno/sequence2.h index f8db769f9359..d1a50a3743f5 100644 --- a/cppu/inc/uno/sequence2.h +++ b/cppu/inc/uno/sequence2.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -185,3 +186,5 @@ sal_Bool SAL_CALL uno_type_sequence_realloc( #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/threadpool.h b/cppu/inc/uno/threadpool.h index 4938258a7ab9..0c647442e377 100644 --- a/cppu/inc/uno/threadpool.h +++ b/cppu/inc/uno/threadpool.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -187,3 +188,5 @@ uno_threadpool_destroy( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C(); #ifdef __cplusplus } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/prj/build.lst b/cppu/prj/build.lst index a22ca9ec8b66..0af8b3019621 100644 --- a/cppu/prj/build.lst +++ b/cppu/prj/build.lst @@ -10,3 +10,5 @@ cu cppu\source\UnsafeBridge nmake - all cu_UnsafeBridge cu_inc NULL cu cppu\source\AffineBridge nmake - all cu_AffineBridge cu_inc NULL cu cppu\source\LogBridge nmake - all cu_LogBridge cu_inc NULL cu cppu\util nmake - all cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL +cu cppu\qa nmake - all cu_qa_cppunit cu_util NULL +cu cppu\qa\cppumaker nmake - all cu_qa_cppumaker cu_util NULL diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst index 411a51cf2518..87ff914710e8 100644 --- a/cppu/prj/d.lst +++ b/cppu/prj/d.lst @@ -1,74 +1,74 @@ -mkdir: %_DEST%\inc%_EXT%\cppu -mkdir: %_DEST%\inc%_EXT%\cppu\helper\purpenv -mkdir: %_DEST%\inc%_EXT%\com -mkdir: %_DEST%\inc%_EXT%\com\sun -mkdir: %_DEST%\inc%_EXT%\com\sun\star -mkdir: %_DEST%\inc%_EXT%\com\sun\star\uno -mkdir: %_DEST%\inc%_EXT%\typelib -mkdir: %_DEST%\inc%_EXT%\uno +mkdir: %_DEST%\inc\cppu +mkdir: %_DEST%\inc\cppu\helper\purpenv +mkdir: %_DEST%\inc\com +mkdir: %_DEST%\inc\com\sun +mkdir: %_DEST%\inc\com\sun\star +mkdir: %_DEST%\inc\com\sun\star\uno +mkdir: %_DEST%\inc\typelib +mkdir: %_DEST%\inc\uno -..\inc\cppu\macros.hxx %_DEST%\inc%_EXT%\cppu\macros.hxx -..\inc\cppu\unotype.hxx %_DEST%\inc%_EXT%\cppu\unotype.hxx +..\inc\cppu\macros.hxx %_DEST%\inc\cppu\macros.hxx +..\inc\cppu\unotype.hxx %_DEST%\inc\cppu\unotype.hxx -..\inc\com\sun\star\uno\Reference.h %_DEST%\inc%_EXT%\com\sun\star\uno\Reference.h -..\inc\com\sun\star\uno\Reference.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\Reference.hxx -..\inc\com\sun\star\uno\Type.h %_DEST%\inc%_EXT%\com\sun\star\uno\Type.h -..\inc\com\sun\star\uno\Type.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\Type.hxx -..\inc\com\sun\star\uno\Any.h %_DEST%\inc%_EXT%\com\sun\star\uno\Any.h -..\inc\com\sun\star\uno\Any.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\Any.hxx -..\inc\com\sun\star\uno\Sequence.h %_DEST%\inc%_EXT%\com\sun\star\uno\Sequence.h -..\inc\com\sun\star\uno\Sequence.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\Sequence.hxx -..\inc\com\sun\star\uno\genfunc.h %_DEST%\inc%_EXT%\com\sun\star\uno\genfunc.h -..\inc\com\sun\star\uno\genfunc.hxx %_DEST%\inc%_EXT%\com\sun\star\uno\genfunc.hxx +..\inc\com\sun\star\uno\Reference.h %_DEST%\inc\com\sun\star\uno\Reference.h +..\inc\com\sun\star\uno\Reference.hxx %_DEST%\inc\com\sun\star\uno\Reference.hxx +..\inc\com\sun\star\uno\Type.h %_DEST%\inc\com\sun\star\uno\Type.h +..\inc\com\sun\star\uno\Type.hxx %_DEST%\inc\com\sun\star\uno\Type.hxx +..\inc\com\sun\star\uno\Any.h %_DEST%\inc\com\sun\star\uno\Any.h +..\inc\com\sun\star\uno\Any.hxx %_DEST%\inc\com\sun\star\uno\Any.hxx +..\inc\com\sun\star\uno\Sequence.h %_DEST%\inc\com\sun\star\uno\Sequence.h +..\inc\com\sun\star\uno\Sequence.hxx %_DEST%\inc\com\sun\star\uno\Sequence.hxx +..\inc\com\sun\star\uno\genfunc.h %_DEST%\inc\com\sun\star\uno\genfunc.h +..\inc\com\sun\star\uno\genfunc.hxx %_DEST%\inc\com\sun\star\uno\genfunc.hxx -..\inc\typelib\typeclass.h %_DEST%\inc%_EXT%\typelib\typeclass.h -..\inc\typelib\typedescription.h %_DEST%\inc%_EXT%\typelib\typedescription.h -..\inc\typelib\typedescription.hxx %_DEST%\inc%_EXT%\typelib\typedescription.hxx -..\inc\typelib\uik.h %_DEST%\inc%_EXT%\typelib\uik.h +..\inc\typelib\typeclass.h %_DEST%\inc\typelib\typeclass.h +..\inc\typelib\typedescription.h %_DEST%\inc\typelib\typedescription.h +..\inc\typelib\typedescription.hxx %_DEST%\inc\typelib\typedescription.hxx +..\inc\typelib\uik.h %_DEST%\inc\typelib\uik.h -..\inc\uno\dispatcher.h %_DEST%\inc%_EXT%\uno\dispatcher.h -..\inc\uno\dispatcher.hxx %_DEST%\inc%_EXT%\uno\dispatcher.hxx -..\inc\uno\any2.h %_DEST%\inc%_EXT%\uno\any2.h -..\inc\uno\sequence2.h %_DEST%\inc%_EXT%\uno\sequence2.h -..\inc\uno\data.h %_DEST%\inc%_EXT%\uno\data.h -..\inc\uno\lbnames.h %_DEST%\inc%_EXT%\uno\lbnames.h -..\inc\uno\environment.h %_DEST%\inc%_EXT%\uno\environment.h -..\inc\uno\environment.hxx %_DEST%\inc%_EXT%\uno\environment.hxx -..\inc\uno\mapping.h %_DEST%\inc%_EXT%\uno\mapping.h -..\inc\uno\mapping.hxx %_DEST%\inc%_EXT%\uno\mapping.hxx -..\inc\uno\threadpool.h %_DEST%\inc%_EXT%\uno\threadpool.h -..\inc\uno\current_context.h %_DEST%\inc%_EXT%\uno\current_context.h -..\inc\uno\current_context.hxx %_DEST%\inc%_EXT%\uno\current_context.hxx -..\inc\uno\cuno.h %_DEST%\inc%_EXT%\uno\cuno.h -..\inc\uno\EnvDcp.h %_DEST%\inc%_EXT%\uno\EnvDcp.h -..\inc\uno\Enterable.h %_DEST%\inc%_EXT%\uno\Enterable.h +..\inc\uno\dispatcher.h %_DEST%\inc\uno\dispatcher.h +..\inc\uno\dispatcher.hxx %_DEST%\inc\uno\dispatcher.hxx +..\inc\uno\any2.h %_DEST%\inc\uno\any2.h +..\inc\uno\sequence2.h %_DEST%\inc\uno\sequence2.h +..\inc\uno\data.h %_DEST%\inc\uno\data.h +..\inc\uno\lbnames.h %_DEST%\inc\uno\lbnames.h +..\inc\uno\environment.h %_DEST%\inc\uno\environment.h +..\inc\uno\environment.hxx %_DEST%\inc\uno\environment.hxx +..\inc\uno\mapping.h %_DEST%\inc\uno\mapping.h +..\inc\uno\mapping.hxx %_DEST%\inc\uno\mapping.hxx +..\inc\uno\threadpool.h %_DEST%\inc\uno\threadpool.h +..\inc\uno\current_context.h %_DEST%\inc\uno\current_context.h +..\inc\uno\current_context.hxx %_DEST%\inc\uno\current_context.hxx +..\inc\uno\cuno.h %_DEST%\inc\uno\cuno.h +..\inc\uno\EnvDcp.h %_DEST%\inc\uno\EnvDcp.h +..\inc\uno\Enterable.h %_DEST%\inc\uno\Enterable.h -..\inc\cppu\EnvDcp.hxx %_DEST%\inc%_EXT%\cppu\EnvDcp.hxx -..\inc\cppu\Enterable.hxx %_DEST%\inc%_EXT%\cppu\Enterable.hxx -..\inc\cppu\EnvGuards.hxx %_DEST%\inc%_EXT%\cppu\EnvGuards.hxx -..\inc\cppu\FreeReference.hxx %_DEST%\inc%_EXT%\cppu\FreeReference.hxx -..\inc\cppu\Map.hxx %_DEST%\inc%_EXT%\cppu\Map.hxx -..\inc\cppu\Shield.hxx %_DEST%\inc%_EXT%\cppu\Shield.hxx +..\inc\cppu\EnvDcp.hxx %_DEST%\inc\cppu\EnvDcp.hxx +..\inc\cppu\Enterable.hxx %_DEST%\inc\cppu\Enterable.hxx +..\inc\cppu\EnvGuards.hxx %_DEST%\inc\cppu\EnvGuards.hxx +..\inc\cppu\FreeReference.hxx %_DEST%\inc\cppu\FreeReference.hxx +..\inc\cppu\Map.hxx %_DEST%\inc\cppu\Map.hxx +..\inc\cppu\Shield.hxx %_DEST%\inc\cppu\Shield.hxx -..\inc\cppu\helper\purpenv\Environment.hxx %_DEST%\inc%_EXT%\cppu\helper\purpenv\Environment.hxx -..\inc\cppu\helper\purpenv\Mapping.hxx %_DEST%\inc%_EXT%\cppu\helper\purpenv\Mapping.hxx +..\inc\cppu\helper\purpenv\Environment.hxx %_DEST%\inc\cppu\helper\purpenv\Environment.hxx +..\inc\cppu\helper\purpenv\Mapping.hxx %_DEST%\inc\cppu\helper\purpenv\Mapping.hxx -..\%__SRC%\lib\icppu.lib %_DEST%\lib%_EXT%\icppu.lib -..\%__SRC%\bin\cppu* %_DEST%\bin%_EXT%\* -..\%__SRC%\lib\libuno_cppu.*.* %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\icppu.lib %_DEST%\lib\icppu.lib +..\%__SRC%\bin\cppu* %_DEST%\bin\* +..\%__SRC%\lib\libuno_cppu.* %_DEST%\lib\* -..\%__SRC%\lib\ipurpenvhelper* %_DEST%\lib%_EXT%\* -..\%__SRC%\bin\purpe*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib%_EXT%\* +..\%__SRC%\lib\ipurpenvhelper* %_DEST%\lib\* +..\%__SRC%\bin\purpe*.dll %_DEST%\bin\* +..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib\* -..\%__SRC%\bin\unsafe_u*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\lib\libunsafe_uno_uno.* %_DEST%\lib%_EXT%\* +..\%__SRC%\bin\unsafe_u*.dll %_DEST%\bin\* +..\%__SRC%\lib\libunsafe_uno_uno.* %_DEST%\lib\* -..\%__SRC%\bin\affine_u*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\lib\libaffine_uno_uno.* %_DEST%\lib%_EXT%\* +..\%__SRC%\bin\affine_u*.dll %_DEST%\bin\* +..\%__SRC%\lib\libaffine_uno_uno.* %_DEST%\lib\* -..\%__SRC%\bin\log_u*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\lib\liblog_uno_uno.* %_DEST%\lib%_EXT%\* +..\%__SRC%\bin\log_u*.dll %_DEST%\bin\* +..\%__SRC%\lib\liblog_uno_uno.* %_DEST%\lib\* linklib: libuno_cppu.*.* linklib: libuno_purpenvhelper*.*.* diff --git a/cppu/qa/cppumaker/makefile.mk b/cppu/qa/cppumaker/makefile.mk new file mode 100644 index 000000000000..accda46fce3f --- /dev/null +++ b/cppu/qa/cppumaker/makefile.mk @@ -0,0 +1,77 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ := ../.. +PRJNAME := cppu +TARGET := test_cppumaker + +ENABLE_EXCEPTIONS := TRUE + +.INCLUDE: settings.mk + +.IF "$(CROSS_COMPILING)"=="YES" +all: + @echo Nothing done when cross-compiling +.ENDIF + +CFLAGSCXX += $(CPPUNIT_CFLAGS) + +DLLPRE = # no leading "lib" on .so files + +INCPRE += $(MISC)/$(TARGET)/inc + +SHL1TARGET = $(TARGET) +SHL1OBJS = $(SLO)/test_cppumaker.obj +SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) +SHL1VERSIONMAP = version.map +SHL1IMPLIB = i$(SHL1TARGET) +DEF1NAME = $(SHL1TARGET) + +SLOFILES = $(SHL1OBJS) + +.INCLUDE: target.mk + +ALLTAR: test + +$(SHL1OBJS): $(MISC)/$(TARGET).cppumaker.flag + +$(MISC)/$(TARGET).cppumaker.flag: $(MISC)/$(TARGET).rdb + - $(MKDIRHIER) $(MISC)/$(TARGET)/inc + $(CPPUMAKER) \ + -O$(MISC)/$(TARGET)/inc -BUCR -C $< $(SOLARBINDIR)/udkapi.rdb + $(TOUCH) $@ + +$(MISC)/$(TARGET).rdb: $(MISC)/$(TARGET)/types.urd + - rm -f $@ + $(REGMERGE) $@ /UCR $< + +$(MISC)/$(TARGET)/types.urd: types.idl + - $(MKDIR) $(MISC)/$(TARGET) + $(IDLC) -O$(MISC)/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< + +test .PHONY: $(SHL1TARGETN) + $(CPPUNITTESTER) $< diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx new file mode 100644 index 000000000000..8e71264209fc --- /dev/null +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -0,0 +1,582 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_cppu.hxx" + +#include "FILE.hpp" +#include "lconv.hpp" +#include "tm.hpp" +#include "std.hpp" +#include "test/codemaker/cppumaker/XTest.hpp" +#include "test/codemaker/cppumaker/S1.hpp" +#include "test/codemaker/cppumaker/services/asm.hpp" +#include "test/codemaker/cppumaker/services/auto.hpp" +#include "test/codemaker/cppumaker/services/bool.hpp" +#include "test/codemaker/cppumaker/services/break.hpp" +//TODO: #include "test/codemaker/cppumaker/services/case.hpp" +#include "test/codemaker/cppumaker/services/catch.hpp" +//TODO: #include "test/codemaker/cppumaker/services/char.hpp" +#include "test/codemaker/cppumaker/services/class.hpp" +//TODO: #include "test/codemaker/cppumaker/services/const.hpp" +#include "test/codemaker/cppumaker/services/continue.hpp" +//TODO: #include "test/codemaker/cppumaker/services/default.hpp" +#include "test/codemaker/cppumaker/services/delete.hpp" +#include "test/codemaker/cppumaker/services/do.hpp" +//TODO: #include "test/codemaker/cppumaker/services/double.hpp" +#include "test/codemaker/cppumaker/services/else.hpp" +//TODO: #include "test/codemaker/cppumaker/services/enum.hpp" +#include "test/codemaker/cppumaker/services/explicit.hpp" +#include "test/codemaker/cppumaker/services/export.hpp" +#include "test/codemaker/cppumaker/services/extern.hpp" +#include "test/codemaker/cppumaker/services/false.hpp" +//TODO: #include "test/codemaker/cppumaker/services/float.hpp" +#include "test/codemaker/cppumaker/services/for.hpp" +#include "test/codemaker/cppumaker/services/friend.hpp" +#include "test/codemaker/cppumaker/services/goto.hpp" +#include "test/codemaker/cppumaker/services/if.hpp" +#include "test/codemaker/cppumaker/services/inline.hpp" +#include "test/codemaker/cppumaker/services/int.hpp" +//TODO: #include "test/codemaker/cppumaker/services/long.hpp" +#include "test/codemaker/cppumaker/services/mutable.hpp" +#include "test/codemaker/cppumaker/services/namespace.hpp" +#include "test/codemaker/cppumaker/services/new.hpp" +#include "test/codemaker/cppumaker/services/operator.hpp" +#include "test/codemaker/cppumaker/services/private.hpp" +#include "test/codemaker/cppumaker/services/protected.hpp" +#include "test/codemaker/cppumaker/services/public.hpp" +#include "test/codemaker/cppumaker/services/register.hpp" +#include "test/codemaker/cppumaker/services/return.hpp" +//TODO: #include "test/codemaker/cppumaker/services/short.hpp" +#include "test/codemaker/cppumaker/services/signed.hpp" +#include "test/codemaker/cppumaker/services/sizeof.hpp" +#include "test/codemaker/cppumaker/services/static.hpp" +//TODO: #include "test/codemaker/cppumaker/services/struct.hpp" +//TODO: #include "test/codemaker/cppumaker/services/switch.hpp" +#include "test/codemaker/cppumaker/services/template.hpp" +#include "test/codemaker/cppumaker/services/this.hpp" +#include "test/codemaker/cppumaker/services/throw.hpp" +#include "test/codemaker/cppumaker/services/true.hpp" +#include "test/codemaker/cppumaker/services/try.hpp" +//TODO: #include "test/codemaker/cppumaker/services/typedef.hpp" +#include "test/codemaker/cppumaker/services/typeid.hpp" +#include "test/codemaker/cppumaker/services/typename.hpp" +//TODO: #include "test/codemaker/cppumaker/services/union.hpp" +//TODO: #include "test/codemaker/cppumaker/services/unsigned.hpp" +#include "test/codemaker/cppumaker/services/using.hpp" +#include "test/codemaker/cppumaker/services/virtual.hpp" +//TODO: #include "test/codemaker/cppumaker/services/void.hpp" +#include "test/codemaker/cppumaker/services/volatile.hpp" +#include "test/codemaker/cppumaker/services/while.hpp" +#include "test/codemaker/cppumaker/services/and.hpp" +#include "test/codemaker/cppumaker/services/bitand.hpp" +#include "test/codemaker/cppumaker/services/bitor.hpp" +#include "test/codemaker/cppumaker/services/compl.hpp" +#include "test/codemaker/cppumaker/services/not.hpp" +#include "test/codemaker/cppumaker/services/or.hpp" +#include "test/codemaker/cppumaker/services/xor.hpp" +#include "test/codemaker/cppumaker/services/BUFSIZ.hpp" +#include "test/codemaker/cppumaker/services/CLOCKS_PER_SEC.hpp" +#include "test/codemaker/cppumaker/services/EDOM.hpp" +#include "test/codemaker/cppumaker/services/EOF.hpp" +#include "test/codemaker/cppumaker/services/ERANGE.hpp" +#include "test/codemaker/cppumaker/services/EXIT_FAILURE.hpp" +#include "test/codemaker/cppumaker/services/EXIT_SUCCESS.hpp" +#include "test/codemaker/cppumaker/services/FILENAME_MAX.hpp" +#include "test/codemaker/cppumaker/services/FOPEN_MAX.hpp" +#include "test/codemaker/cppumaker/services/HUGE_VAL.hpp" +#include "test/codemaker/cppumaker/services/LC_ALL.hpp" +#include "test/codemaker/cppumaker/services/LC_COLLATE.hpp" +#include "test/codemaker/cppumaker/services/LC_CTYPE.hpp" +#include "test/codemaker/cppumaker/services/LC_MONETARY.hpp" +#include "test/codemaker/cppumaker/services/LC_NUMERIC.hpp" +#include "test/codemaker/cppumaker/services/LC_TIME.hpp" +#include "test/codemaker/cppumaker/services/L_tmpnam.hpp" +#include "test/codemaker/cppumaker/services/MB_CUR_MAX.hpp" +#include "test/codemaker/cppumaker/services/NULL.hpp" +#include "test/codemaker/cppumaker/services/RAND_MAX.hpp" +#include "test/codemaker/cppumaker/services/SEEK_CUR.hpp" +#include "test/codemaker/cppumaker/services/SEEK_END.hpp" +#include "test/codemaker/cppumaker/services/SEEK_SET.hpp" +#include "test/codemaker/cppumaker/services/SIGABRT.hpp" +#include "test/codemaker/cppumaker/services/SIGFPE.hpp" +#include "test/codemaker/cppumaker/services/SIGILL.hpp" +#include "test/codemaker/cppumaker/services/SIGINT.hpp" +#include "test/codemaker/cppumaker/services/SIGSEGV.hpp" +#include "test/codemaker/cppumaker/services/SIGTERM.hpp" +#include "test/codemaker/cppumaker/services/SIG_DFL.hpp" +#include "test/codemaker/cppumaker/services/SIG_ERR.hpp" +#include "test/codemaker/cppumaker/services/SIG_IGN.hpp" +#include "test/codemaker/cppumaker/services/TMP_MAX.hpp" +#include "test/codemaker/cppumaker/services/WCHAR_MAX.hpp" +#include "test/codemaker/cppumaker/services/WCHAR_MIN.hpp" +#include "test/codemaker/cppumaker/services/WEOF.hpp" +#include "test/codemaker/cppumaker/services/assert.hpp" +#include "test/codemaker/cppumaker/services/errno.hpp" +#include "test/codemaker/cppumaker/services/offsetof.hpp" +#include "test/codemaker/cppumaker/services/setjmp.hpp" +#include "test/codemaker/cppumaker/services/stderr.hpp" +#include "test/codemaker/cppumaker/services/stdin.hpp" +#include "test/codemaker/cppumaker/services/stdout.hpp" +#include "test/codemaker/cppumaker/services/CHAR_BIT.hpp" +#include "test/codemaker/cppumaker/services/CHAR_MAX.hpp" +#include "test/codemaker/cppumaker/services/CHAR_MIN.hpp" +#include "test/codemaker/cppumaker/services/DBL_DIG.hpp" +#include "test/codemaker/cppumaker/services/DBL_EPSILON.hpp" +#include "test/codemaker/cppumaker/services/DBL_MANT_DIG.hpp" +#include "test/codemaker/cppumaker/services/DBL_MAX.hpp" +#include "test/codemaker/cppumaker/services/DBL_MAX_10_EXP.hpp" +#include "test/codemaker/cppumaker/services/DBL_MAX_EXP.hpp" +#include "test/codemaker/cppumaker/services/DBL_MIN.hpp" +#include "test/codemaker/cppumaker/services/DBL_MIN_10_EXP.hpp" +#include "test/codemaker/cppumaker/services/DBL_MIN_EXP.hpp" +#include "test/codemaker/cppumaker/services/FLT_DIG.hpp" +#include "test/codemaker/cppumaker/services/FLT_EPSILON.hpp" +#include "test/codemaker/cppumaker/services/FLT_MANT_DIG.hpp" +#include "test/codemaker/cppumaker/services/FLT_MAX.hpp" +#include "test/codemaker/cppumaker/services/FLT_MAX_10_EXP.hpp" +#include "test/codemaker/cppumaker/services/FLT_MAX_EXP.hpp" +#include "test/codemaker/cppumaker/services/FLT_MIN.hpp" +#include "test/codemaker/cppumaker/services/FLT_MIN_10_EXP.hpp" +#include "test/codemaker/cppumaker/services/FLT_MIN_EXP.hpp" +#include "test/codemaker/cppumaker/services/FLT_RADIX.hpp" +#include "test/codemaker/cppumaker/services/FLT_ROUNDS.hpp" +#include "test/codemaker/cppumaker/services/INT_MAX.hpp" +#include "test/codemaker/cppumaker/services/INT_MIN.hpp" +#include "test/codemaker/cppumaker/services/LDBL_DIG.hpp" +#include "test/codemaker/cppumaker/services/LDBL_EPSILON.hpp" +#include "test/codemaker/cppumaker/services/LDBL_MANT_DIG.hpp" +#include "test/codemaker/cppumaker/services/LDBL_MAX.hpp" +#include "test/codemaker/cppumaker/services/LDBL_MAX_10_EXP.hpp" +#include "test/codemaker/cppumaker/services/LDBL_MAX_EXP.hpp" +#include "test/codemaker/cppumaker/services/LDBL_MIN.hpp" +#include "test/codemaker/cppumaker/services/LDBL_MIN_10_EXP.hpp" +#include "test/codemaker/cppumaker/services/LDBL_MIN_EXP.hpp" +#include "test/codemaker/cppumaker/services/LONG_MAX.hpp" +#include "test/codemaker/cppumaker/services/LONG_MIN.hpp" +#include "test/codemaker/cppumaker/services/MB_LEN_MAX.hpp" +#include "test/codemaker/cppumaker/services/SCHAR_MAX.hpp" +#include "test/codemaker/cppumaker/services/SCHAR_MIN.hpp" +#include "test/codemaker/cppumaker/services/SHRT_MAX.hpp" +#include "test/codemaker/cppumaker/services/SHRT_MIN.hpp" +#include "test/codemaker/cppumaker/services/UCHAR_MAX.hpp" +#include "test/codemaker/cppumaker/services/UINT_MAX.hpp" +#include "test/codemaker/cppumaker/services/ULONG_MAX.hpp" +#include "test/codemaker/cppumaker/services/USHRT_MAX.hpp" +#include "test/codemaker/cppumaker/services/FILE.hpp" +#include "test/codemaker/cppumaker/services/lconv.hpp" +#include "test/codemaker/cppumaker/services/tm.hpp" +#include "test/codemaker/cppumaker/services/std.hpp" +#include "test/codemaker/cppumaker/services/NDEBUG.hpp" +#include "test/codemaker/cppumaker/services/create.hpp" +#include "test/codemaker/cppumaker/singletons/asm.hpp" +#include "test/codemaker/cppumaker/singletons/auto.hpp" +#include "test/codemaker/cppumaker/singletons/bool.hpp" +#include "test/codemaker/cppumaker/singletons/break.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/case.hpp" +#include "test/codemaker/cppumaker/singletons/catch.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/char.hpp" +#include "test/codemaker/cppumaker/singletons/class.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/const.hpp" +#include "test/codemaker/cppumaker/singletons/continue.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/default.hpp" +#include "test/codemaker/cppumaker/singletons/delete.hpp" +#include "test/codemaker/cppumaker/singletons/do.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/double.hpp" +#include "test/codemaker/cppumaker/singletons/else.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/enum.hpp" +#include "test/codemaker/cppumaker/singletons/explicit.hpp" +#include "test/codemaker/cppumaker/singletons/export.hpp" +#include "test/codemaker/cppumaker/singletons/extern.hpp" +#include "test/codemaker/cppumaker/singletons/false.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/float.hpp" +#include "test/codemaker/cppumaker/singletons/for.hpp" +#include "test/codemaker/cppumaker/singletons/friend.hpp" +#include "test/codemaker/cppumaker/singletons/goto.hpp" +#include "test/codemaker/cppumaker/singletons/if.hpp" +#include "test/codemaker/cppumaker/singletons/inline.hpp" +#include "test/codemaker/cppumaker/singletons/int.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/long.hpp" +#include "test/codemaker/cppumaker/singletons/mutable.hpp" +#include "test/codemaker/cppumaker/singletons/namespace.hpp" +#include "test/codemaker/cppumaker/singletons/new.hpp" +#include "test/codemaker/cppumaker/singletons/operator.hpp" +#include "test/codemaker/cppumaker/singletons/private.hpp" +#include "test/codemaker/cppumaker/singletons/protected.hpp" +#include "test/codemaker/cppumaker/singletons/public.hpp" +#include "test/codemaker/cppumaker/singletons/register.hpp" +#include "test/codemaker/cppumaker/singletons/return.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/short.hpp" +#include "test/codemaker/cppumaker/singletons/signed.hpp" +#include "test/codemaker/cppumaker/singletons/sizeof.hpp" +#include "test/codemaker/cppumaker/singletons/static.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/struct.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/switch.hpp" +#include "test/codemaker/cppumaker/singletons/template.hpp" +#include "test/codemaker/cppumaker/singletons/this.hpp" +#include "test/codemaker/cppumaker/singletons/throw.hpp" +#include "test/codemaker/cppumaker/singletons/true.hpp" +#include "test/codemaker/cppumaker/singletons/try.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/typedef.hpp" +#include "test/codemaker/cppumaker/singletons/typeid.hpp" +#include "test/codemaker/cppumaker/singletons/typename.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/union.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/unsigned.hpp" +#include "test/codemaker/cppumaker/singletons/using.hpp" +#include "test/codemaker/cppumaker/singletons/virtual.hpp" +//TODO: #include "test/codemaker/cppumaker/singletons/void.hpp" +#include "test/codemaker/cppumaker/singletons/volatile.hpp" +#include "test/codemaker/cppumaker/singletons/while.hpp" +#include "test/codemaker/cppumaker/singletons/and.hpp" +#include "test/codemaker/cppumaker/singletons/bitand.hpp" +#include "test/codemaker/cppumaker/singletons/bitor.hpp" +#include "test/codemaker/cppumaker/singletons/compl.hpp" +#include "test/codemaker/cppumaker/singletons/not.hpp" +#include "test/codemaker/cppumaker/singletons/or.hpp" +#include "test/codemaker/cppumaker/singletons/xor.hpp" +#include "test/codemaker/cppumaker/singletons/BUFSIZ.hpp" +#include "test/codemaker/cppumaker/singletons/CLOCKS_PER_SEC.hpp" +#include "test/codemaker/cppumaker/singletons/EDOM.hpp" +#include "test/codemaker/cppumaker/singletons/EOF.hpp" +#include "test/codemaker/cppumaker/singletons/ERANGE.hpp" +#include "test/codemaker/cppumaker/singletons/EXIT_FAILURE.hpp" +#include "test/codemaker/cppumaker/singletons/EXIT_SUCCESS.hpp" +#include "test/codemaker/cppumaker/singletons/FILENAME_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/FOPEN_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/HUGE_VAL.hpp" +#include "test/codemaker/cppumaker/singletons/LC_ALL.hpp" +#include "test/codemaker/cppumaker/singletons/LC_COLLATE.hpp" +#include "test/codemaker/cppumaker/singletons/LC_CTYPE.hpp" +#include "test/codemaker/cppumaker/singletons/LC_MONETARY.hpp" +#include "test/codemaker/cppumaker/singletons/LC_NUMERIC.hpp" +#include "test/codemaker/cppumaker/singletons/LC_TIME.hpp" +#include "test/codemaker/cppumaker/singletons/L_tmpnam.hpp" +#include "test/codemaker/cppumaker/singletons/MB_CUR_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/NULL.hpp" +#include "test/codemaker/cppumaker/singletons/RAND_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/SEEK_CUR.hpp" +#include "test/codemaker/cppumaker/singletons/SEEK_END.hpp" +#include "test/codemaker/cppumaker/singletons/SEEK_SET.hpp" +#include "test/codemaker/cppumaker/singletons/SIGABRT.hpp" +#include "test/codemaker/cppumaker/singletons/SIGFPE.hpp" +#include "test/codemaker/cppumaker/singletons/SIGILL.hpp" +#include "test/codemaker/cppumaker/singletons/SIGINT.hpp" +#include "test/codemaker/cppumaker/singletons/SIGSEGV.hpp" +#include "test/codemaker/cppumaker/singletons/SIGTERM.hpp" +#include "test/codemaker/cppumaker/singletons/SIG_DFL.hpp" +#include "test/codemaker/cppumaker/singletons/SIG_ERR.hpp" +#include "test/codemaker/cppumaker/singletons/SIG_IGN.hpp" +#include "test/codemaker/cppumaker/singletons/TMP_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/WCHAR_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/WCHAR_MIN.hpp" +#include "test/codemaker/cppumaker/singletons/WEOF.hpp" +#include "test/codemaker/cppumaker/singletons/assert.hpp" +#include "test/codemaker/cppumaker/singletons/errno.hpp" +#include "test/codemaker/cppumaker/singletons/offsetof.hpp" +#include "test/codemaker/cppumaker/singletons/setjmp.hpp" +#include "test/codemaker/cppumaker/singletons/stderr.hpp" +#include "test/codemaker/cppumaker/singletons/stdin.hpp" +#include "test/codemaker/cppumaker/singletons/stdout.hpp" +#include "test/codemaker/cppumaker/singletons/CHAR_BIT.hpp" +#include "test/codemaker/cppumaker/singletons/CHAR_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/CHAR_MIN.hpp" +#include "test/codemaker/cppumaker/singletons/DBL_DIG.hpp" +#include "test/codemaker/cppumaker/singletons/DBL_EPSILON.hpp" +#include "test/codemaker/cppumaker/singletons/DBL_MANT_DIG.hpp" +#include "test/codemaker/cppumaker/singletons/DBL_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/DBL_MAX_10_EXP.hpp" +#include "test/codemaker/cppumaker/singletons/DBL_MAX_EXP.hpp" +#include "test/codemaker/cppumaker/singletons/DBL_MIN.hpp" +#include "test/codemaker/cppumaker/singletons/DBL_MIN_10_EXP.hpp" +#include "test/codemaker/cppumaker/singletons/DBL_MIN_EXP.hpp" +#include "test/codemaker/cppumaker/singletons/FLT_DIG.hpp" +#include "test/codemaker/cppumaker/singletons/FLT_EPSILON.hpp" +#include "test/codemaker/cppumaker/singletons/FLT_MANT_DIG.hpp" +#include "test/codemaker/cppumaker/singletons/FLT_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/FLT_MAX_10_EXP.hpp" +#include "test/codemaker/cppumaker/singletons/FLT_MAX_EXP.hpp" +#include "test/codemaker/cppumaker/singletons/FLT_MIN.hpp" +#include "test/codemaker/cppumaker/singletons/FLT_MIN_10_EXP.hpp" +#include "test/codemaker/cppumaker/singletons/FLT_MIN_EXP.hpp" +#include "test/codemaker/cppumaker/singletons/FLT_RADIX.hpp" +#include "test/codemaker/cppumaker/singletons/FLT_ROUNDS.hpp" +#include "test/codemaker/cppumaker/singletons/INT_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/INT_MIN.hpp" +#include "test/codemaker/cppumaker/singletons/LDBL_DIG.hpp" +#include "test/codemaker/cppumaker/singletons/LDBL_EPSILON.hpp" +#include "test/codemaker/cppumaker/singletons/LDBL_MANT_DIG.hpp" +#include "test/codemaker/cppumaker/singletons/LDBL_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/LDBL_MAX_10_EXP.hpp" +#include "test/codemaker/cppumaker/singletons/LDBL_MAX_EXP.hpp" +#include "test/codemaker/cppumaker/singletons/LDBL_MIN.hpp" +#include "test/codemaker/cppumaker/singletons/LDBL_MIN_10_EXP.hpp" +#include "test/codemaker/cppumaker/singletons/LDBL_MIN_EXP.hpp" +#include "test/codemaker/cppumaker/singletons/LONG_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/LONG_MIN.hpp" +#include "test/codemaker/cppumaker/singletons/MB_LEN_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/SCHAR_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/SCHAR_MIN.hpp" +#include "test/codemaker/cppumaker/singletons/SHRT_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/SHRT_MIN.hpp" +#include "test/codemaker/cppumaker/singletons/UCHAR_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/UINT_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/ULONG_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/USHRT_MAX.hpp" +#include "test/codemaker/cppumaker/singletons/FILE.hpp" +#include "test/codemaker/cppumaker/singletons/lconv.hpp" +#include "test/codemaker/cppumaker/singletons/tm.hpp" +#include "test/codemaker/cppumaker/singletons/std.hpp" +#include "test/codemaker/cppumaker/singletons/NDEBUG.hpp" +#include "test/codemaker/cppumaker/singletons/get.hpp" +#include "test/codemaker/cppumaker/HelperEnum.hpp" +#include "test/codemaker/cppumaker/HelperStruct.hpp" +#include "test/codemaker/cppumaker/BigStruct.hpp" +#include "test/codemaker/cppumaker/Struct.hpp" +#include "test/codemaker/cppumaker/StructUsage.hpp" +#include "test/codemaker/cppumaker/AlignmentDerivedStruct.hpp" +#include "test/codemaker/cppumaker/TestException1.hpp" +#include "test/codemaker/cppumaker/TestException2.hpp" +#include "test/codemaker/cppumaker/Constants.hpp" + +#include "boost/scoped_array.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/TypeClass.hpp" +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" + +#include <cstddef> +#include <iostream> + +namespace { + +class Test: public CppUnit::TestFixture { +public: + void testBigStruct(); + + void testPolyStruct(); + + void testExceptions(); + + void testConstants(); + + CPPUNIT_TEST_SUITE(Test); + CPPUNIT_TEST(testBigStruct); + CPPUNIT_TEST(testPolyStruct); + CPPUNIT_TEST(testExceptions); + CPPUNIT_TEST(testConstants); + CPPUNIT_TEST_SUITE_END(); +}; + +struct Guard { + explicit Guard(void * buffer): + p(new(buffer) test::codemaker::cppumaker::BigStruct) {} + + ~Guard() { p->test::codemaker::cppumaker::BigStruct::~BigStruct(); } + + test::codemaker::cppumaker::BigStruct * const p; +}; + +void Test::testBigStruct() { + // Default-initialize a BigStruct instance on top of a memory buffer filled + // with random data, and make sure that all members are default-initialized: + boost::scoped_array< char > buffer( + new char[sizeof (test::codemaker::cppumaker::BigStruct)]); + for (std::size_t i = 0; i < sizeof (test::codemaker::cppumaker::BigStruct); + ++i) + { + buffer[i] = '\x56'; + } + Guard guard(buffer.get()); + CPPUNIT_ASSERT_EQUAL(guard.p->m1, sal_False); + CPPUNIT_ASSERT_EQUAL(guard.p->m2, static_cast< sal_Int8 >(0)); + CPPUNIT_ASSERT_EQUAL(guard.p->m3, static_cast< sal_Int16 >(0)); + CPPUNIT_ASSERT_EQUAL(guard.p->m4, static_cast< sal_uInt16 >(0)); + CPPUNIT_ASSERT_EQUAL(guard.p->m5, static_cast< sal_Int32 >(0)); + CPPUNIT_ASSERT_EQUAL(guard.p->m6, static_cast< sal_uInt32 >(0)); + CPPUNIT_ASSERT_EQUAL(guard.p->m7, static_cast< sal_Int64 >(0)); + CPPUNIT_ASSERT_EQUAL(guard.p->m8, static_cast< sal_uInt64 >(0)); + CPPUNIT_ASSERT_EQUAL(guard.p->m9, 0.0f); + CPPUNIT_ASSERT_EQUAL(guard.p->m10, 0.0); + 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); + 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); + 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); + 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)); + +//This is a very platform specific test. +#if defined __GNUC__ && __GNUC__ >= 3 // see CPPU_GCC3_ALIGN +#if defined(LINUX) && (defined (X86_64) || defined(X86) || defined(PPC)) + CPPUNIT_ASSERT_EQUAL( +#if defined X86_64 || defined PPC + static_cast< std::size_t >(24), +#else + static_cast< std::size_t >(16), +#endif + sizeof (test::codemaker::cppumaker::AlignmentDerivedStruct)); +#endif +#endif + + com::sun::star::uno::Type t( + cppu::UnoType< test::codemaker::cppumaker::BigStruct >::get()); + typelib_TypeDescription * td = NULL; + t.getDescription(&td); + typelib_typedescription_complete(&td); + fprintf(stdout, "#### 1\n"); + CPPUNIT_ASSERT(td != NULL); + 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; +} + +void Test::testPolyStruct() { + CPPUNIT_ASSERT_EQUAL( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "test.codemaker.cppumaker.Struct<char,short>")), + (com::sun::star::uno::makeAny( + test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()). + getValueType().getTypeName())); + + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > + aEmptySequence; + + CPPUNIT_ASSERT_EQUAL( + (test::codemaker::cppumaker::make_Struct< sal_uInt32, sal_Bool >(5, + aEmptySequence).member1), + static_cast< sal_uInt32 >(5)); +} + +namespace { + +bool operator ==( + test::codemaker::cppumaker::TestException1 const & e1, + test::codemaker::cppumaker::TestException1 const & e2) +{ + return e1.Message == e2.Message && e1.Context == e2.Context + && e1.m1 == e2.m1 && e1.m2 == e2.m2 && e1.m3 == e2.m3 + && e1.m4.member1 == e2.m4.member1 && e1.m4.member2 == e2.m4.member2; +} + +std::ostream & operator <<( + std::ostream & out, com::sun::star::uno::Exception const &) +{ + return out << "<UNO exception>"; +} + +} + +void Test::testExceptions() { + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > + aEmptySequence; + + test::codemaker::cppumaker::TestException1 e11( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1, + com::sun::star::uno::makeAny(123.0), + test::codemaker::cppumaker::HelperEnum_ONE, + test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2); + test::codemaker::cppumaker::TestException1 e12(e11); + CPPUNIT_ASSERT_EQUAL(e11, e12); + test::codemaker::cppumaker::TestException1 e13; + e13 = e11; + CPPUNIT_ASSERT_EQUAL(e11, e13); + test::codemaker::cppumaker::TestException2 e21( + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("abc")), 0, 1, + com::sun::star::uno::makeAny(123.0), + test::codemaker::cppumaker::HelperEnum_ONE, + test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2); + test::codemaker::cppumaker::TestException2 e22(e21); + CPPUNIT_ASSERT_EQUAL(e21, e22); + test::codemaker::cppumaker::TestException2 e23; + e23 = e21; + CPPUNIT_ASSERT_EQUAL(e21, e23); +} + +void Test::testConstants() { + CPPUNIT_ASSERT_EQUAL( + SAL_MIN_INT8, test::codemaker::cppumaker::Constants::byteMin); + CPPUNIT_ASSERT_EQUAL( + SAL_MAX_INT8, test::codemaker::cppumaker::Constants::byteMax); + CPPUNIT_ASSERT_EQUAL( + static_cast< sal_Int8 >(-1), + test::codemaker::cppumaker::Constants::byteNeg); + CPPUNIT_ASSERT_EQUAL( + SAL_MIN_INT16, test::codemaker::cppumaker::Constants::shortMin); + CPPUNIT_ASSERT_EQUAL( + SAL_MAX_INT16, test::codemaker::cppumaker::Constants::shortMax); + CPPUNIT_ASSERT_EQUAL( + static_cast< sal_uInt16 >(0), + test::codemaker::cppumaker::Constants::unsignedShortMin); + CPPUNIT_ASSERT_EQUAL( + SAL_MAX_UINT16, + test::codemaker::cppumaker::Constants::unsignedShortMax); + CPPUNIT_ASSERT_EQUAL( + SAL_MIN_INT32, test::codemaker::cppumaker::Constants::longMin); + CPPUNIT_ASSERT_EQUAL( + SAL_MAX_INT32, test::codemaker::cppumaker::Constants::longMax); + CPPUNIT_ASSERT_EQUAL( + static_cast< sal_uInt32 >(0), + test::codemaker::cppumaker::Constants::unsignedLongMin); + CPPUNIT_ASSERT_EQUAL( + SAL_MAX_UINT32, test::codemaker::cppumaker::Constants::unsignedLongMax); + CPPUNIT_ASSERT_EQUAL( + SAL_MIN_INT64, test::codemaker::cppumaker::Constants::hyperMin); + CPPUNIT_ASSERT_EQUAL( + SAL_MAX_INT64, test::codemaker::cppumaker::Constants::hyperMax); + CPPUNIT_ASSERT_EQUAL( + static_cast< sal_uInt64 >(0), + test::codemaker::cppumaker::Constants::unsignedHyperMin); + CPPUNIT_ASSERT_EQUAL( + SAL_MAX_UINT64, + test::codemaker::cppumaker::Constants::unsignedHyperMax); +} + +CPPUNIT_TEST_SUITE_REGISTRATION(Test); + +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/qa/cppumaker/types.idl b/cppu/qa/cppumaker/types.idl new file mode 100644 index 000000000000..9d9c70234ae3 --- /dev/null +++ b/cppu/qa/cppumaker/types.idl @@ -0,0 +1,717 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +/*TODO: Do not depend on types for which C++ header files are only generated + later in the build process in offuh: */ +#include "com/sun/star/lang/ClassNotFoundException.idl" +#include "com/sun/star/lang/IllegalAccessException.idl" +#include "com/sun/star/lang/Locale.idl" +#include "com/sun/star/uno/DeploymentException.idl" +#include "com/sun/star/uno/Exception.idl" +#include "com/sun/star/uno/RuntimeException.idl" +#include "com/sun/star/uno/XInterface.idl" +#include "com/sun/star/uno/XNamingService.idl" + +singleton FILE: com::sun::star::uno::XInterface; +singleton lconv: com::sun::star::uno::XInterface; +singleton tm: com::sun::star::uno::XInterface; + +singleton std: com::sun::star::uno::XInterface; + +module test { module codemaker { module cppumaker { + +interface XTest { + boolean test(); + + [attribute, bound] long A1; + [attribute, bound, readonly] long A2; + [attribute] long A3 { + get raises + (com::sun::star::uno::Exception, + com::sun::star::lang::ClassNotFoundException); + set raises (com::sun::star::uno::RuntimeException); + }; + [attribute, readonly] long A4 { + get raises (com::sun::star::uno::DeploymentException); + }; +}; + +typedef boolean Boolean; +typedef byte Byte; +typedef short Short; +typedef unsigned short UnsignedShort; +typedef long Long; +typedef unsigned long UnsignedLong; +typedef hyper Hyper; +typedef unsigned hyper UnsignedHyper; +typedef float Float; +typedef double Double; +typedef char Char; +typedef string String; +typedef type Type; +typedef any Any; +typedef com::sun::star::lang::Locale Locale; +typedef com::sun::star::uno::XInterface XInterface; +typedef com::sun::star::uno::XNamingService XNamingService; + +typedef sequence< Boolean > SequenceBoolean; +typedef sequence< Byte > SequenceByte; +typedef sequence< Short > SequenceShort; +typedef sequence< UnsignedShort > SequenceUnsignedShort; +typedef sequence< Long > SequenceLong; +typedef sequence< UnsignedLong > SequenceUnsignedLong; +typedef sequence< Hyper > SequenceHyper; +typedef sequence< UnsignedHyper > SequenceUnsignedHyper; +typedef sequence< Float > SequenceFloat; +typedef sequence< Double > SequenceDouble; +typedef sequence< Char > SequenceChar; +typedef sequence< String > SequenceString; +typedef sequence< Type > SequenceType; +typedef sequence< Any > SequenceAny; +typedef sequence< Locale > SequenceLocale; +typedef sequence< XInterface > SequenceXInterface; +typedef sequence< XNamingService > SequenceXNamingService; + +service S1: XTest { + create1(); + + create2([in] any... create2) + raises (com::sun::star::uno::RuntimeException, + com::sun::star::lang::ClassNotFoundException, + com::sun::star::uno::Exception, + com::sun::star::lang::IllegalAccessException, + com::sun::star::uno::DeploymentException); + + create3([in] sequence<any> S1) + raises (com::sun::star::uno::RuntimeException, + com::sun::star::lang::ClassNotFoundException, + com::sun::star::lang::IllegalAccessException, + com::sun::star::uno::DeploymentException); + + create4([in] long javamaker, [in] long S1, [in] long create4); + + create5( + [in] boolean p1, + [in] byte p2, + [in] short p3, + [in] unsigned short p4, + [in] long p5, + [in] unsigned long p6, + [in] hyper p7, + [in] unsigned hyper p8, + [in] float p9, + [in] double p10, + [in] char p11, + [in] string p12, + [in] type p13, + [in] any p14, + [in] com::sun::star::lang::Locale p15, + [in] com::sun::star::uno::XInterface p16, + [in] com::sun::star::uno::XNamingService p17, + [in] Boolean t1, + [in] Byte t2, + [in] Short t3, + [in] UnsignedShort t4, + [in] Long t5, + [in] UnsignedLong t6, + [in] Hyper t7, + [in] UnsignedHyper t8, + [in] Float t9, + [in] Double t10, + [in] Char t11, + [in] String t12, + [in] Type t13, + [in] Any t14, + [in] Locale t15, + [in] XInterface t16, + [in] XNamingService t17, + [in] sequence< sequence< boolean > > a1, + [in] sequence< sequence< byte > > a2, + [in] sequence< sequence< short > > a3, + [in] sequence< sequence< unsigned short > > a4, + [in] sequence< sequence< long > > a5, + [in] sequence< sequence< unsigned long > > a6, + [in] sequence< sequence< hyper > > a7, + [in] sequence< sequence< unsigned hyper > > a8, + [in] sequence< sequence< float > > a9, + [in] sequence< sequence< double > > a10, + [in] sequence< sequence< char > > a11, + [in] sequence< sequence< string > > a12, + [in] sequence< sequence< type > > a13, + [in] sequence< sequence< any > > a14, + [in] sequence< sequence< com::sun::star::lang::Locale > > a15, + [in] sequence< sequence< com::sun::star::uno::XInterface > > a16, + [in] sequence< sequence< + com::sun::star::uno::XNamingService > > a17, + [in] sequence< SequenceBoolean > at1, + [in] sequence< SequenceByte > at2, + [in] sequence< SequenceShort > at3, + [in] sequence< SequenceUnsignedShort > at4, + [in] sequence< SequenceLong > at5, + [in] sequence< SequenceUnsignedLong > at6, + [in] sequence< SequenceHyper > at7, + [in] sequence< SequenceUnsignedHyper > at8, + [in] sequence< SequenceFloat > at9, + [in] sequence< SequenceDouble > at10, + [in] sequence< SequenceChar > at11, + [in] sequence< SequenceString > at12, + [in] sequence< SequenceType > at13, + [in] sequence< SequenceAny > at14, + [in] sequence< SequenceLocale > at15, + [in] sequence< SequenceXInterface > at16, + [in] sequence< SequenceXNamingService > at17); +}; + +service S2: XTest; + +service S3 { interface XTest; }; + +singleton S4 { service S2; }; + +module services { + +service asm: com::sun::star::uno::XInterface { asm([in] long asm); }; +service auto: com::sun::star::uno::XInterface { auto([in] long auto); }; +service bool: com::sun::star::uno::XInterface { bool([in] long bool); }; +service break: com::sun::star::uno::XInterface { break([in] long break); }; +//TODO: service case: com::sun::star::uno::XInterface { case([in] long case); }; +service catch: com::sun::star::uno::XInterface { catch([in] long catch); }; +//TODO: service char: com::sun::star::uno::XInterface { char([in] long char); }; +service class: com::sun::star::uno::XInterface { class([in] long class); }; +//TODO: service const: com::sun::star::uno::XInterface { +// const([in] long const); }; +service continue: com::sun::star::uno::XInterface { + continue([in] long continue); }; +//TODO: service default: com::sun::star::uno::XInterface { +// default([in] long default); }; +service delete: com::sun::star::uno::XInterface { delete([in] long delete); }; +service do: com::sun::star::uno::XInterface { do([in] long do); }; +//TODO: service double: com::sun::star::uno::XInterface { +// double([in] long double); }; +service else: com::sun::star::uno::XInterface { else([in] long else); }; +//TODO: service enum: com::sun::star::uno::XInterface { enum([in] long enum); }; +service explicit: com::sun::star::uno::XInterface { + explicit([in] long explicit); }; +service export: com::sun::star::uno::XInterface { export([in] long export); }; +service extern: com::sun::star::uno::XInterface { extern([in] long extern); }; +service false: com::sun::star::uno::XInterface { false([in] long false); }; +//TODO: service float: com::sun::star::uno::XInterface { +// float([in] long float); }; +service for: com::sun::star::uno::XInterface { for([in] long for); }; +service friend: com::sun::star::uno::XInterface { friend([in] long friend); }; +service goto: com::sun::star::uno::XInterface { goto([in] long goto); }; +service if: com::sun::star::uno::XInterface { if([in] long if); }; +service inline: com::sun::star::uno::XInterface { inline([in] long inline); }; +service int: com::sun::star::uno::XInterface { int([in] long int); }; +//TODO: service long: com::sun::star::uno::XInterface { long([in] long long); }; +service mutable: com::sun::star::uno::XInterface { + mutable([in] long mutable); }; +service namespace: com::sun::star::uno::XInterface { + namespace([in] long namespace); }; +service new: com::sun::star::uno::XInterface { new([in] long new); }; +service operator: com::sun::star::uno::XInterface { + operator([in] long operator); }; +service private: com::sun::star::uno::XInterface { + private([in] long private); }; +service protected: com::sun::star::uno::XInterface { + protected([in] long protected); }; +service public: com::sun::star::uno::XInterface { public([in] long public); }; +service register: com::sun::star::uno::XInterface { + register([in] long register); }; +service return: com::sun::star::uno::XInterface { return([in] long return); }; +//TODO: service short: com::sun::star::uno::XInterface { +// short([in] long short); }; +service signed: com::sun::star::uno::XInterface { signed([in] long signed); }; +service sizeof: com::sun::star::uno::XInterface { sizeof([in] long sizeof); }; +service static: com::sun::star::uno::XInterface { static([in] long static); }; +//TODO: service struct: com::sun::star::uno::XInterface { +// struct([in] long struct); }; +//TODO: service switch: com::sun::star::uno::XInterface { +// switch([in] long switch); }; +service template: com::sun::star::uno::XInterface { + template([in] long template); }; +service this: com::sun::star::uno::XInterface { this([in] long this); }; +service throw: com::sun::star::uno::XInterface { throw([in] long throw); }; +service true: com::sun::star::uno::XInterface { true([in] long true); }; +service try: com::sun::star::uno::XInterface { try([in] long try); }; +//TODO: service typedef: com::sun::star::uno::XInterface { +// typedef([in] long typedef); }; +service typeid: com::sun::star::uno::XInterface { typeid([in] long typeid); }; +service typename: com::sun::star::uno::XInterface { + typename([in] long typename); }; +//TODO: service union: com::sun::star::uno::XInterface { +// union([in] long union); }; +//TODO: service unsigned: com::sun::star::uno::XInterface { +// unsigned([in] long unsigned); }; +service using: com::sun::star::uno::XInterface { using([in] long using); }; +service virtual: com::sun::star::uno::XInterface { + virtual([in] long virtual); }; +//TODO: service void: com::sun::star::uno::XInterface { void([in] long void); }; +service volatile: com::sun::star::uno::XInterface { + volatile([in] long volatile); }; +service while: com::sun::star::uno::XInterface { while([in] long while); }; + +service and: com::sun::star::uno::XInterface { and([in] long and); }; +service bitand: com::sun::star::uno::XInterface { bitand([in] long bitand); }; +service bitor: com::sun::star::uno::XInterface { bitor([in] long bitor); }; +service compl: com::sun::star::uno::XInterface { compl([in] long compl); }; +service not: com::sun::star::uno::XInterface { not([in] long not); }; +service or: com::sun::star::uno::XInterface { or([in] long or); }; +service xor: com::sun::star::uno::XInterface { xor([in] long xor); }; + +service BUFSIZ: com::sun::star::uno::XInterface { BUFSIZ([in] long BUFSIZ); }; +service CLOCKS_PER_SEC: com::sun::star::uno::XInterface { + CLOCKS_PER_SEC([in] long CLOCKS_PER_SEC); }; +service EDOM: com::sun::star::uno::XInterface { EDOM([in] long EDOM); }; +service EOF: com::sun::star::uno::XInterface { EOF([in] long EOF); }; +service ERANGE: com::sun::star::uno::XInterface { ERANGE([in] long ERANGE); }; +service EXIT_FAILURE: com::sun::star::uno::XInterface { + EXIT_FAILURE([in] long EXIT_FAILURE); }; +service EXIT_SUCCESS: com::sun::star::uno::XInterface { + EXIT_SUCCESS([in] long EXIT_SUCCESS); }; +service FILENAME_MAX: com::sun::star::uno::XInterface { + FILENAME_MAX([in] long FILENAME_MAX); }; +service FOPEN_MAX: com::sun::star::uno::XInterface { + FOPEN_MAX([in] long FOPEN_MAX); }; +service HUGE_VAL: com::sun::star::uno::XInterface { + HUGE_VAL([in] long HUGE_VAL); }; +service LC_ALL: com::sun::star::uno::XInterface { LC_ALL([in] long LC_ALL); }; +service LC_COLLATE: com::sun::star::uno::XInterface { + LC_COLLATE([in] long LC_COLLATE); }; +service LC_CTYPE: com::sun::star::uno::XInterface { + LC_CTYPE([in] long LC_CTYPE); }; +service LC_MONETARY: com::sun::star::uno::XInterface { + LC_MONETARY([in] long LC_MONETARY); }; +service LC_NUMERIC: com::sun::star::uno::XInterface { + LC_NUMERIC([in] long LC_NUMERIC); }; +service LC_TIME: com::sun::star::uno::XInterface { + LC_TIME([in] long LC_TIME); }; +service L_tmpnam: com::sun::star::uno::XInterface { + L_tmpnam([in] long L_tmpnam); }; +service MB_CUR_MAX: com::sun::star::uno::XInterface { + MB_CUR_MAX([in] long MB_CUR_MAX); }; +service NULL: com::sun::star::uno::XInterface { NULL([in] long NULL); }; +service RAND_MAX: com::sun::star::uno::XInterface { + RAND_MAX([in] long RAND_MAX); }; +service SEEK_CUR: com::sun::star::uno::XInterface { + SEEK_CUR([in] long SEEK_CUR); }; +service SEEK_END: com::sun::star::uno::XInterface { + SEEK_END([in] long SEEK_END); }; +service SEEK_SET: com::sun::star::uno::XInterface { + SEEK_SET([in] long SEEK_SET); }; +service SIGABRT: com::sun::star::uno::XInterface { + SIGABRT([in] long SIGABRT); }; +service SIGFPE: com::sun::star::uno::XInterface { SIGFPE([in] long SIGFPE); }; +service SIGILL: com::sun::star::uno::XInterface { SIGILL([in] long SIGILL); }; +service SIGINT: com::sun::star::uno::XInterface { SIGINT([in] long SIGINT); }; +service SIGSEGV: com::sun::star::uno::XInterface { + SIGSEGV([in] long SIGSEGV); }; +service SIGTERM: com::sun::star::uno::XInterface { + SIGTERM([in] long SIGTERM); }; +service SIG_DFL: com::sun::star::uno::XInterface { + SIG_DFL([in] long SIG_DFL); }; +service SIG_ERR: com::sun::star::uno::XInterface { + SIG_ERR([in] long SIG_ERR); }; +service SIG_IGN: com::sun::star::uno::XInterface { + SIG_IGN([in] long SIG_IGN); }; +service TMP_MAX: com::sun::star::uno::XInterface { + TMP_MAX([in] long TMP_MAX); }; +service WCHAR_MAX: com::sun::star::uno::XInterface { + WCHAR_MAX([in] long WCHAR_MAX); }; +service WCHAR_MIN: com::sun::star::uno::XInterface { + WCHAR_MIN([in] long WCHAR_MIN); }; +service WEOF: com::sun::star::uno::XInterface { WEOF([in] long WEOF); }; +service assert: com::sun::star::uno::XInterface { assert([in] long assert); }; +service errno: com::sun::star::uno::XInterface { errno([in] long errno); }; +service offsetof: com::sun::star::uno::XInterface { + offsetof([in] long offsetof); }; +service setjmp: com::sun::star::uno::XInterface { setjmp([in] long setjmp); }; +service stderr: com::sun::star::uno::XInterface { stderr([in] long stderr); }; +service stdin: com::sun::star::uno::XInterface { stdin([in] long stdin); }; +service stdout: com::sun::star::uno::XInterface { stdout([in] long stdout); }; + +service CHAR_BIT: com::sun::star::uno::XInterface { + CHAR_BIT([in] long CHAR_BIT); }; +service CHAR_MAX: com::sun::star::uno::XInterface { + CHAR_MAX([in] long CHAR_MAX); }; +service CHAR_MIN: com::sun::star::uno::XInterface { + CHAR_MIN([in] long CHAR_MIN); }; +service DBL_DIG: com::sun::star::uno::XInterface { + DBL_DIG([in] long DBL_DIG); }; +service DBL_EPSILON: com::sun::star::uno::XInterface { + DBL_EPSILON([in] long DBL_EPSILON); }; +service DBL_MANT_DIG: com::sun::star::uno::XInterface { + DBL_MANT_DIG([in] long DBL_MANT_DIG); }; +service DBL_MAX: com::sun::star::uno::XInterface { + DBL_MAX([in] long DBL_MAX); }; +service DBL_MAX_10_EXP: com::sun::star::uno::XInterface { + DBL_MAX_10_EXP([in] long DBL_MAX_10_EXP); }; +service DBL_MAX_EXP: com::sun::star::uno::XInterface { + DBL_MAX_EXP([in] long DBL_MAX_EXP); }; +service DBL_MIN: com::sun::star::uno::XInterface { + DBL_MIN([in] long DBL_MIN); }; +service DBL_MIN_10_EXP: com::sun::star::uno::XInterface { + DBL_MIN_10_EXP([in] long DBL_MIN_10_EXP); }; +service DBL_MIN_EXP: com::sun::star::uno::XInterface { + DBL_MIN_EXP([in] long DBL_MIN_EXP); }; +service FLT_DIG: com::sun::star::uno::XInterface { + FLT_DIG([in] long FLT_DIG); }; +service FLT_EPSILON: com::sun::star::uno::XInterface { + FLT_EPSILON([in] long FLT_EPSILON); }; +service FLT_MANT_DIG: com::sun::star::uno::XInterface { + FLT_MANT_DIG([in] long FLT_MANT_DIG); }; +service FLT_MAX: com::sun::star::uno::XInterface { + FLT_MAX([in] long FLT_MAX); }; +service FLT_MAX_10_EXP: com::sun::star::uno::XInterface { + FLT_MAX_10_EXP([in] long FLT_MAX_10_EXP); }; +service FLT_MAX_EXP: com::sun::star::uno::XInterface { + FLT_MAX_EXP([in] long FLT_MAX_EXP); }; +service FLT_MIN: com::sun::star::uno::XInterface { + FLT_MIN([in] long FLT_MIN); }; +service FLT_MIN_10_EXP: com::sun::star::uno::XInterface { + FLT_MIN_10_EXP([in] long FLT_MIN_10_EXP); }; +service FLT_MIN_EXP: com::sun::star::uno::XInterface { + FLT_MIN_EXP([in] long FLT_MIN_EXP); }; +service FLT_RADIX: com::sun::star::uno::XInterface { + FLT_RADIX([in] long FLT_RADIX); }; +service FLT_ROUNDS: com::sun::star::uno::XInterface { + FLT_ROUNDS([in] long FLT_ROUNDS); }; +service INT_MAX: com::sun::star::uno::XInterface { + INT_MAX([in] long INT_MAX); }; +service INT_MIN: com::sun::star::uno::XInterface { + INT_MIN([in] long INT_MIN); }; +service LDBL_DIG: com::sun::star::uno::XInterface { + LDBL_DIG([in] long LDBL_DIG); }; +service LDBL_EPSILON: com::sun::star::uno::XInterface { + LDBL_EPSILON([in] long LDBL_EPSILON); }; +service LDBL_MANT_DIG: com::sun::star::uno::XInterface { + LDBL_MANT_DIG([in] long LDBL_MANT_DIG); }; +service LDBL_MAX: com::sun::star::uno::XInterface { + LDBL_MAX([in] long LDBL_MAX); }; +service LDBL_MAX_10_EXP: com::sun::star::uno::XInterface { + LDBL_MAX_10_EXP([in] long LDBL_MAX_10_EXP); }; +service LDBL_MAX_EXP: com::sun::star::uno::XInterface { + LDBL_MAX_EXP([in] long LDBL_MAX_EXP); }; +service LDBL_MIN: com::sun::star::uno::XInterface { + LDBL_MIN([in] long LDBL_MIN); }; +service LDBL_MIN_10_EXP: com::sun::star::uno::XInterface { + LDBL_MIN_10_EXP([in] long LDBL_MIN_10_EXP); }; +service LDBL_MIN_EXP: com::sun::star::uno::XInterface { + LDBL_MIN_EXP([in] long LDBL_MIN_EXP); }; +service LONG_MAX: com::sun::star::uno::XInterface { + LONG_MAX([in] long LONG_MAX); }; +service LONG_MIN: com::sun::star::uno::XInterface { + LONG_MIN([in] long LONG_MIN); }; +service MB_LEN_MAX: com::sun::star::uno::XInterface { + MB_LEN_MAX([in] long MB_LEN_MAX); }; +service SCHAR_MAX: com::sun::star::uno::XInterface { + SCHAR_MAX([in] long SCHAR_MAX); }; +service SCHAR_MIN: com::sun::star::uno::XInterface { + SCHAR_MIN([in] long SCHAR_MIN); }; +service SHRT_MAX: com::sun::star::uno::XInterface { + SHRT_MAX([in] long SHRT_MAX); }; +service SHRT_MIN: com::sun::star::uno::XInterface { + SHRT_MIN([in] long SHRT_MIN); }; +service UCHAR_MAX: com::sun::star::uno::XInterface { + UCHAR_MAX([in] long UCHAR_MAX); }; +service UINT_MAX: com::sun::star::uno::XInterface { + UINT_MAX([in] long UINT_MAX); }; +service ULONG_MAX: com::sun::star::uno::XInterface { + ULONG_MAX([in] long ULONG_MAX); }; +service USHRT_MAX: com::sun::star::uno::XInterface { + USHRT_MAX([in] long USHRT_MAX); }; + +service FILE: com::sun::star::uno::XInterface { FILE([in] long FILE); }; +service lconv: com::sun::star::uno::XInterface { lconv([in] long lconv); }; +service tm: com::sun::star::uno::XInterface { tm([in] long tm); }; + +service std: com::sun::star::uno::XInterface { std([in] long std); }; + +service NDEBUG: com::sun::star::uno::XInterface { NDEBUG([in] long NDEBUG); }; + +service create: com::sun::star::uno::XInterface; + +}; + +module singletons { + +singleton asm: com::sun::star::uno::XInterface; +singleton auto: com::sun::star::uno::XInterface; +singleton bool: com::sun::star::uno::XInterface; +singleton break: com::sun::star::uno::XInterface; +//TODO: singleton case: com::sun::star::uno::XInterface; +singleton catch: com::sun::star::uno::XInterface; +//TODO: singleton char: com::sun::star::uno::XInterface; +singleton class: com::sun::star::uno::XInterface; +//TODO: singleton const: com::sun::star::uno::XInterface; +singleton continue: com::sun::star::uno::XInterface; +//TODO: singleton default: com::sun::star::uno::XInterface; +singleton delete: com::sun::star::uno::XInterface; +singleton do: com::sun::star::uno::XInterface; +//TODO: singleton double: com::sun::star::uno::XInterface; +singleton else: com::sun::star::uno::XInterface; +//TODO: singleton enum: com::sun::star::uno::XInterface; +singleton explicit: com::sun::star::uno::XInterface; +singleton export: com::sun::star::uno::XInterface; +singleton extern: com::sun::star::uno::XInterface; +singleton false: com::sun::star::uno::XInterface; +//TODO: singleton float: com::sun::star::uno::XInterface; +singleton for: com::sun::star::uno::XInterface; +singleton friend: com::sun::star::uno::XInterface; +singleton goto: com::sun::star::uno::XInterface; +singleton if: com::sun::star::uno::XInterface; +singleton inline: com::sun::star::uno::XInterface; +singleton int: com::sun::star::uno::XInterface; +//TODO: singleton long: com::sun::star::uno::XInterface; +singleton mutable: com::sun::star::uno::XInterface; +singleton namespace: com::sun::star::uno::XInterface; +singleton new: com::sun::star::uno::XInterface; +singleton operator: com::sun::star::uno::XInterface; +singleton private: com::sun::star::uno::XInterface; +singleton protected: com::sun::star::uno::XInterface; +singleton public: com::sun::star::uno::XInterface; +singleton register: com::sun::star::uno::XInterface; +singleton return: com::sun::star::uno::XInterface; +//TODO: singleton short: com::sun::star::uno::XInterface; +singleton signed: com::sun::star::uno::XInterface; +singleton sizeof: com::sun::star::uno::XInterface; +singleton static: com::sun::star::uno::XInterface; +//TODO: singleton struct: com::sun::star::uno::XInterface; +//TODO: singleton switch: com::sun::star::uno::XInterface; +singleton template: com::sun::star::uno::XInterface; +singleton this: com::sun::star::uno::XInterface; +singleton throw: com::sun::star::uno::XInterface; +singleton true: com::sun::star::uno::XInterface; +singleton try: com::sun::star::uno::XInterface; +//TODO: singleton typedef: com::sun::star::uno::XInterface; +singleton typeid: com::sun::star::uno::XInterface; +singleton typename: com::sun::star::uno::XInterface; +//TODO: singleton union: com::sun::star::uno::XInterface; +//TODO: singleton unsigned: com::sun::star::uno::XInterface; +singleton using: com::sun::star::uno::XInterface; +singleton virtual: com::sun::star::uno::XInterface; +//TODO: singleton void: com::sun::star::uno::XInterface; +singleton volatile: com::sun::star::uno::XInterface; +singleton while: com::sun::star::uno::XInterface; + +singleton and: com::sun::star::uno::XInterface; +singleton bitand: com::sun::star::uno::XInterface; +singleton bitor: com::sun::star::uno::XInterface; +singleton compl: com::sun::star::uno::XInterface; +singleton not: com::sun::star::uno::XInterface; +singleton or: com::sun::star::uno::XInterface; +singleton xor: com::sun::star::uno::XInterface; + +singleton BUFSIZ: com::sun::star::uno::XInterface; +singleton CLOCKS_PER_SEC: com::sun::star::uno::XInterface; +singleton EDOM: com::sun::star::uno::XInterface; +singleton EOF: com::sun::star::uno::XInterface; +singleton ERANGE: com::sun::star::uno::XInterface; +singleton EXIT_FAILURE: com::sun::star::uno::XInterface; +singleton EXIT_SUCCESS: com::sun::star::uno::XInterface; +singleton FILENAME_MAX: com::sun::star::uno::XInterface; +singleton FOPEN_MAX: com::sun::star::uno::XInterface; +singleton HUGE_VAL: com::sun::star::uno::XInterface; +singleton LC_ALL: com::sun::star::uno::XInterface; +singleton LC_COLLATE: com::sun::star::uno::XInterface; +singleton LC_CTYPE: com::sun::star::uno::XInterface; +singleton LC_MONETARY: com::sun::star::uno::XInterface; +singleton LC_NUMERIC: com::sun::star::uno::XInterface; +singleton LC_TIME: com::sun::star::uno::XInterface; +singleton L_tmpnam: com::sun::star::uno::XInterface; +singleton MB_CUR_MAX: com::sun::star::uno::XInterface; +singleton NULL: com::sun::star::uno::XInterface; +singleton RAND_MAX: com::sun::star::uno::XInterface; +singleton SEEK_CUR: com::sun::star::uno::XInterface; +singleton SEEK_END: com::sun::star::uno::XInterface; +singleton SEEK_SET: com::sun::star::uno::XInterface; +singleton SIGABRT: com::sun::star::uno::XInterface; +singleton SIGFPE: com::sun::star::uno::XInterface; +singleton SIGILL: com::sun::star::uno::XInterface; +singleton SIGINT: com::sun::star::uno::XInterface; +singleton SIGSEGV: com::sun::star::uno::XInterface; +singleton SIGTERM: com::sun::star::uno::XInterface; +singleton SIG_DFL: com::sun::star::uno::XInterface; +singleton SIG_ERR: com::sun::star::uno::XInterface; +singleton SIG_IGN: com::sun::star::uno::XInterface; +singleton TMP_MAX: com::sun::star::uno::XInterface; +singleton WCHAR_MAX: com::sun::star::uno::XInterface; +singleton WCHAR_MIN: com::sun::star::uno::XInterface; +singleton WEOF: com::sun::star::uno::XInterface; +singleton assert: com::sun::star::uno::XInterface; +singleton errno: com::sun::star::uno::XInterface; +singleton offsetof: com::sun::star::uno::XInterface; +singleton setjmp: com::sun::star::uno::XInterface; +singleton stderr: com::sun::star::uno::XInterface; +singleton stdin: com::sun::star::uno::XInterface; +singleton stdout: com::sun::star::uno::XInterface; + +singleton CHAR_BIT: com::sun::star::uno::XInterface; +singleton CHAR_MAX: com::sun::star::uno::XInterface; +singleton CHAR_MIN: com::sun::star::uno::XInterface; +singleton DBL_DIG: com::sun::star::uno::XInterface; +singleton DBL_EPSILON: com::sun::star::uno::XInterface; +singleton DBL_MANT_DIG: com::sun::star::uno::XInterface; +singleton DBL_MAX: com::sun::star::uno::XInterface; +singleton DBL_MAX_10_EXP: com::sun::star::uno::XInterface; +singleton DBL_MAX_EXP: com::sun::star::uno::XInterface; +singleton DBL_MIN: com::sun::star::uno::XInterface; +singleton DBL_MIN_10_EXP: com::sun::star::uno::XInterface; +singleton DBL_MIN_EXP: com::sun::star::uno::XInterface; +singleton FLT_DIG: com::sun::star::uno::XInterface; +singleton FLT_EPSILON: com::sun::star::uno::XInterface; +singleton FLT_MANT_DIG: com::sun::star::uno::XInterface; +singleton FLT_MAX: com::sun::star::uno::XInterface; +singleton FLT_MAX_10_EXP: com::sun::star::uno::XInterface; +singleton FLT_MAX_EXP: com::sun::star::uno::XInterface; +singleton FLT_MIN: com::sun::star::uno::XInterface; +singleton FLT_MIN_10_EXP: com::sun::star::uno::XInterface; +singleton FLT_MIN_EXP: com::sun::star::uno::XInterface; +singleton FLT_RADIX: com::sun::star::uno::XInterface; +singleton FLT_ROUNDS: com::sun::star::uno::XInterface; +singleton INT_MAX: com::sun::star::uno::XInterface; +singleton INT_MIN: com::sun::star::uno::XInterface; +singleton LDBL_DIG: com::sun::star::uno::XInterface; +singleton LDBL_EPSILON: com::sun::star::uno::XInterface; +singleton LDBL_MANT_DIG: com::sun::star::uno::XInterface; +singleton LDBL_MAX: com::sun::star::uno::XInterface; +singleton LDBL_MAX_10_EXP: com::sun::star::uno::XInterface; +singleton LDBL_MAX_EXP: com::sun::star::uno::XInterface; +singleton LDBL_MIN: com::sun::star::uno::XInterface; +singleton LDBL_MIN_10_EXP: com::sun::star::uno::XInterface; +singleton LDBL_MIN_EXP: com::sun::star::uno::XInterface; +singleton LONG_MAX: com::sun::star::uno::XInterface; +singleton LONG_MIN: com::sun::star::uno::XInterface; +singleton MB_LEN_MAX: com::sun::star::uno::XInterface; +singleton SCHAR_MAX: com::sun::star::uno::XInterface; +singleton SCHAR_MIN: com::sun::star::uno::XInterface; +singleton SHRT_MAX: com::sun::star::uno::XInterface; +singleton SHRT_MIN: com::sun::star::uno::XInterface; +singleton UCHAR_MAX: com::sun::star::uno::XInterface; +singleton UINT_MAX: com::sun::star::uno::XInterface; +singleton ULONG_MAX: com::sun::star::uno::XInterface; +singleton USHRT_MAX: com::sun::star::uno::XInterface; + +singleton FILE: com::sun::star::uno::XInterface; +singleton lconv: com::sun::star::uno::XInterface; +singleton tm: com::sun::star::uno::XInterface; + +singleton std: com::sun::star::uno::XInterface; + +singleton NDEBUG: com::sun::star::uno::XInterface; + +singleton get: com::sun::star::uno::XInterface; + +}; + +enum HelperEnum { ZERO, ONE }; + +struct HelperStruct { boolean m1; com::sun::star::uno::XInterface m2; }; + +typedef byte TDByte; +typedef HelperEnum TDEnum1; +typedef TDEnum1 TDEnum; + +struct BigStruct { + boolean m1; + byte m2; + short m3; + unsigned short m4; + long m5; + unsigned long m6; + hyper m7; + unsigned hyper m8; + float m9; + double m10; + char m11; + string m12; + type m13; + any m14; + sequence<boolean> m15; + HelperEnum m16; + HelperStruct m17; + com::sun::star::uno::XInterface m18; + TDByte m19; + TDEnum m20; + sequence<unsigned short> m21; + sequence<char> m22; + sequence< sequence<char> > m23; +}; + +struct Struct<T, U> { + T member1; + sequence<SequenceAny> member2; +}; + +struct StructUsage { + Struct< long, short > member1; + sequence< + sequence< + Struct< + sequence< Struct< any, boolean > >, + com::sun::star::uno::XInterface > > > + member2; +}; + +struct AlignmentBaseStruct { + double member1; + short member2; +}; + +struct AlignmentDerivedStruct: AlignmentBaseStruct { + short member3; +}; + +exception TestException1: com::sun::star::uno::RuntimeException { + long m1; + any m2; + HelperEnum m3; + Struct<long, long> m4; + unsigned short m5; +}; + +exception TestException2: TestException1 {}; + +constants Constants { + const byte byteMin = -128; + const byte byteMax = 127; + const byte byteNeg = 255; + const short shortMin = -32768; + const short shortMax = 32767; + const unsigned short unsignedShortMin = 0; + const unsigned short unsignedShortMax = 65535; + const long longMin = -2147483648; + const long longMax = 2147483647; + const unsigned long unsignedLongMin = 0; + const unsigned long unsignedLongMax = 4294967295; + const hyper hyperMin = -9223372036854775808; + const hyper hyperMax = 9223372036854775807; + const unsigned hyper unsignedHyperMin = 0; + const unsigned hyper unsignedHyperMax = 18446744073709551615; +}; + +}; }; }; diff --git a/cppu/qa/cppumaker/version.map b/cppu/qa/cppumaker/version.map new file mode 100644 index 000000000000..3308588ef6f8 --- /dev/null +++ b/cppu/qa/cppumaker/version.map @@ -0,0 +1,34 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +UDK_3_0_0 { + global: + cppunitTestPlugIn; + + local: + *; +}; diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk index b40d3512e575..6d9d87935753 100644 --- a/cppu/qa/makefile.mk +++ b/cppu/qa/makefile.mk @@ -33,36 +33,41 @@ ENABLE_EXCEPTIONS := TRUE .INCLUDE: settings.mk -CFLAGSCXX += $(CPPUNIT_CFLAGS) +.IF "$(CROSS_COMPILING)"=="YES" +all: + @echo Nothing done when cross-compiling +.ENDIF -DLLPRE = # no leading "lib" on .so files +CFLAGSCXX+=$(CPPUNIT_CFLAGS) -INCPRE += $(MISC)$/$(TARGET)$/inc +DLLPRE=# no leading "lib" on .so files + +INCPRE+=$(MISC)$/$(TARGET)$/inc SHL1TARGET = $(TARGET)_any SHL1OBJS = $(SLO)$/test_any.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB) +SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) SHL1VERSIONMAP = version.map SHL1IMPLIB = i$(SHL1TARGET) DEF1NAME = $(SHL1TARGET) SHL2TARGET = $(TARGET)_unotype SHL2OBJS = $(SLO)$/test_unotype.obj -SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB) +SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) SHL2VERSIONMAP = version.map SHL2IMPLIB = i$(SHL2TARGET) DEF2NAME = $(SHL2TARGET) SHL3TARGET = $(TARGET)_reference SHL3OBJS = $(SLO)$/test_reference.obj -SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB) +SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) SHL3VERSIONMAP = version.map SHL3IMPLIB = i$(SHL3TARGET) DEF3NAME = $(SHL3TARGET) SHL4TARGET = $(TARGET)_recursion SHL4OBJS = $(SLO)$/test_recursion.obj -SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(TESTSHL2LIB) $(SALLIB) +SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) SHL4VERSIONMAP = version.map SHL4IMPLIB = i$(SHL4TARGET) DEF4NAME = $(SHL4TARGET) @@ -71,10 +76,14 @@ SLOFILES = $(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) $(SHL4OBJS) .INCLUDE: target.mk -ALLTAR: test - $(SHL1OBJS): $(MISC)$/$(TARGET).cppumaker.flag +$(SHL2OBJS): $(MISC)$/$(TARGET).cppumaker.flag + +$(SHL3OBJS): $(MISC)$/$(TARGET).cppumaker.flag + +$(SHL4OBJS): $(MISC)$/$(TARGET).cppumaker.flag + $(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb - $(MKDIRHIER) $(MISC)$/$(TARGET)$/inc $(CPPUMAKER) -O$(MISC)$/$(TARGET)$/inc -BUCR -C $< \ @@ -82,15 +91,11 @@ $(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb $(TOUCH) $@ $(MISC)$/$(TARGET).rdb: $(MISC)$/$(TARGET)$/types.urd - - rm $@ + - $(RM) $@ $(REGMERGE) $@ /UCR $< $(MISC)$/$(TARGET)$/types.urd: types.idl - $(MKDIR) $(MISC)$/$(TARGET) $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< -test .PHONY: $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN) $(SHL4TARGETN) - $(TESTSHL2) $(SHL1TARGETN) - $(TESTSHL2) $(SHL2TARGETN) - $(TESTSHL2) $(SHL3TARGETN) - $(TESTSHL2) $(SHL4TARGETN) +.INCLUDE : _cppunit.mk diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index 1ab601b04c46..71afe9b31a5a 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,6 +33,12 @@ #include <stdlib.h> // wntmsci10 does not like <cstdlib> +#include <cppunit/TestSuite.h> +#include <cppunit/TestFixture.h> +#include <cppunit/TestCase.h> +#include <cppunit/plugin/TestPlugIn.h> +#include <cppunit/extensions/HelperMacros.h> + #include "Enum1.hpp" #include "Enum2.hpp" #include "Exception1.hpp" @@ -55,7 +62,6 @@ #include "com/sun/star/uno/Sequence.hxx" #include "com/sun/star/uno/Type.hxx" #include "com/sun/star/uno/XInterface.hpp" -#include "testshl/simpleheader.hxx" #include "osl/diagnose.h" #include "osl/interlck.h" #include "rtl/string.h" @@ -197,45 +203,25 @@ public: class Test: public CppUnit::TestFixture { public: void testVoid(); - void testBoolean(); - void testByte(); - void testShort(); - void testUnsignedShort(); - void testLong(); - void testUnsignedLong(); - void testHyper(); - void testUnsignedHyper(); - void testFloat(); - void testDouble(); - void testChar(); - void testString(); - void testType(); - void testSequence(); - void testEnum(); - void testStruct(); - void testPoly(); - void testException(); - void testInterface(); - void testNull(); CPPUNIT_TEST_SUITE(Test); @@ -2323,8 +2309,10 @@ void Test::testNull() { } } -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests"); +CPPUNIT_TEST_SUITE_REGISTRATION(Test); } -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/qa/test_recursion.cxx b/cppu/qa/test_recursion.cxx index c0bab3e30b95..81ee1f0664fa 100644 --- a/cppu/qa/test_recursion.cxx +++ b/cppu/qa/test_recursion.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,7 +29,12 @@ #include "precompiled_cppu.hxx" #include "sal/config.h" -#include "testshl/simpleheader.hxx" +#include <cppunit/TestSuite.h> +#include <cppunit/TestFixture.h> +#include <cppunit/TestCase.h> +#include <cppunit/plugin/TestPlugIn.h> +#include <cppunit/extensions/HelperMacros.h> + #include "sal/types.h" #include "Rec.hpp" @@ -50,8 +56,10 @@ void Test::testRecursion() { CPPUNIT_ASSERT_EQUAL(static_cast< sal_Int32 >(0), Rec().x.getLength()); } -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "tests"); +CPPUNIT_TEST_SUITE_REGISTRATION(Test); } -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx index 88a24d8e361d..fbf7011deb67 100644 --- a/cppu/qa/test_reference.cxx +++ b/cppu/qa/test_reference.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,9 +31,14 @@ #include "sal/config.h" +#include <cppunit/TestSuite.h> +#include <cppunit/TestFixture.h> +#include <cppunit/TestCase.h> +#include <cppunit/plugin/TestPlugIn.h> +#include <cppunit/extensions/HelperMacros.h> + #include "Interface1.hpp" -#include "testshl/simpleheader.hxx" #include "rtl/ustring.hxx" #include "sal/types.h" @@ -149,8 +155,10 @@ void Test::testUnoSetThrow() CPPUNIT_ASSERT_EQUAL( false, bCaughtException ); } -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests"); +CPPUNIT_TEST_SUITE_REGISTRATION(Test); } // namespace -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/qa/test_unotype.cxx b/cppu/qa/test_unotype.cxx index eda5be571e7b..f85944ff1021 100644 --- a/cppu/qa/test_unotype.cxx +++ b/cppu/qa/test_unotype.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,6 +31,12 @@ #include "sal/config.h" +#include <cppunit/TestSuite.h> +#include <cppunit/TestFixture.h> +#include <cppunit/TestCase.h> +#include <cppunit/plugin/TestPlugIn.h> +#include <cppunit/extensions/HelperMacros.h> + #include <typeinfo> #include "com/sun/star/beans/Optional.hpp" @@ -44,7 +51,6 @@ #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XInterface.hpp" #include "cppu/unotype.hxx" -#include "testshl/simpleheader.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" #include "sal/types.h" @@ -805,8 +811,10 @@ void Test::testGetTypeFavourChar() { #endif } -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests"); +CPPUNIT_TEST_SUITE_REGISTRATION(Test); } -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/qa/version.map b/cppu/qa/version.map index 7321bbca16ad..3308588ef6f8 100644 --- a/cppu/qa/version.map +++ b/cppu/qa/version.map @@ -27,7 +27,7 @@ UDK_3_0_0 { global: - registerAllTestFunction; + cppunitTestPlugIn; local: *; diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index 59f8213274a6..89647322ad6d 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -362,3 +363,4 @@ extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping cppu::helper::purpenv::createMapping(ppMapping, pFrom, pTo); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index b57cd405c82b..8eb69cc23e4e 100755..100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,7 +39,7 @@ #include "rtl/logfile.hxx" #include "uno/environment.hxx" #include <com/sun/star/uno/Type.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <memory> namespace @@ -246,7 +247,7 @@ void LogProbe( rtl_logfile_longTrace( "} LogBridge () %s",sTemp.getStr()); if ( ppException && *ppException ) { - rtl_logfile_trace( " excption occured : "); + rtl_logfile_trace( " excption occurred : "); typelib_TypeDescription * pElementTypeDescr = 0; TYPELIB_DANGER_GET( &pElementTypeDescr, (*ppException)->pType ); const ::rtl::OString sValue( ::rtl::OUStringToOString(pElementTypeDescr->pTypeName,osl_getThreadTextEncoding())); @@ -275,3 +276,5 @@ extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping { cppu::helper::purpenv::createMapping(ppMapping, pFrom, pTo,LogProbe); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx index 5a531de47182..17ecb4646918 100644 --- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx +++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,3 +162,4 @@ extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_ext_getMapping(uno_Mapping cppu::helper::purpenv::createMapping(ppMapping, pFrom, pTo); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/cppu/cppu_opt.cxx b/cppu/source/cppu/cppu_opt.cxx index a4640fd6f945..6512bd567d71 100644 --- a/cppu/source/cppu/cppu_opt.cxx +++ b/cppu/source/cppu/cppu_opt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,5 @@ extern "C" rtl_uString * SAL_CALL cppu_Any_extraction_failure_msg( rtl_uString_acquire( ret.pData ); return ret.pData; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/helper/purpenv/Proxy.hxx b/cppu/source/helper/purpenv/Proxy.hxx index 570d7291b177..9db0182c2edc 100644 --- a/cppu/source/helper/purpenv/Proxy.hxx +++ b/cppu/source/helper/purpenv/Proxy.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ public: extern "C" SAL_DLLPRIVATE void SAL_CALL Proxy_free(uno_ExtEnvironment * pEnv, void * pProxy) SAL_THROW_EXTERN_C(); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/helper/purpenv/export.mk b/cppu/source/helper/purpenv/export.mk index 7e5e9d04d1d2..004787e4f45c 100644 --- a/cppu/source/helper/purpenv/export.mk +++ b/cppu/source/helper/purpenv/export.mk @@ -4,10 +4,6 @@ NAMEpurpenv_helper := uno_purpenvhelper$(COMID) purpenv_helper_LIB := -l$(NAMEpurpenv_helper) -.ELIF "$(GUI)"=="OS2" -NAMEpurpenv_helper := purpeh$(UDK_MAJOR) -purpenv_helper_LIB := i$(NAMEpurpenv_helper) - .ELSE NAMEpurpenv_helper := purpenvhelper$(UDK_MAJOR)$(COMID) .IF "$(COM)"=="GCC" diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx index 0fbed6739951..52e77785f1ea 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -535,3 +536,5 @@ void Environment_initWithEnterable(uno_Environment * pEnvironment, cppu::Enterab } }}} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx index 0b4b3c9e0786..9c87f82cf470 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -231,3 +232,5 @@ void createMapping(uno_Mapping ** ppMapping, } }}} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx index 344203e38762..1240df313f57 100644 --- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx +++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -171,7 +172,7 @@ extern "C" { static void SAL_CALL s_Proxy_dispatch( break; } default: - OSL_ENSURE( sal_False, "### illegal member typeclass!" ); + OSL_FAIL( "### illegal member typeclass!" ); abort(); } @@ -492,7 +493,7 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef, *ppException = 0; } - else // exception occured + else // exception occurred { for (sal_Int32 nPos = 0; nPos < nParams; ++ nPos) { @@ -528,3 +529,4 @@ void Proxy::dispatch(typelib_TypeDescriptionReference * pReturnTypeRef, ppException); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx index 23bd52ca1917..2ffabcbff014 100644 --- a/cppu/source/threadpool/current.cxx +++ b/cppu/source/threadpool/current.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -295,3 +296,5 @@ extern "C" sal_Bool SAL_CALL uno_getCurrentContext( return sal_True; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/threadpool/current.hxx b/cppu/source/threadpool/current.hxx index fbe0531cf178..45640220116d 100644 --- a/cppu/source/threadpool/current.hxx +++ b/cppu/source/threadpool/current.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,5 @@ struct IdContainer IdContainer * getIdContainer() SAL_THROW( () ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/threadpool/jobqueue.cxx b/cppu/source/threadpool/jobqueue.cxx index 333a350c0b23..9f629e43a457 100644 --- a/cppu/source/threadpool/jobqueue.cxx +++ b/cppu/source/threadpool/jobqueue.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -187,10 +188,12 @@ namespace cppu_threadpool { return m_lstCallstack.empty(); } - sal_Bool JobQueue::isBusy() + sal_Bool JobQueue::isBusy() const { return m_nToDo > 0; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/threadpool/jobqueue.hxx b/cppu/source/threadpool/jobqueue.hxx index 78202573403e..6bddcc73483f 100644 --- a/cppu/source/threadpool/jobqueue.hxx +++ b/cppu/source/threadpool/jobqueue.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,7 +70,7 @@ namespace cppu_threadpool sal_Bool isEmpty(); sal_Bool isCallstackEmpty(); - sal_Bool isBusy(); + sal_Bool isBusy() const; private: ::osl::Mutex m_mutex; @@ -83,3 +84,5 @@ namespace cppu_threadpool } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx index 00c91500d1e5..c6035f0754c7 100644 --- a/cppu/source/threadpool/thread.cxx +++ b/cppu/source/threadpool/thread.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -217,3 +218,5 @@ namespace cppu_threadpool { } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/threadpool/thread.hxx b/cppu/source/threadpool/thread.hxx index 2f7791daf7e5..bbef51eabca4 100644 --- a/cppu/source/threadpool/thread.hxx +++ b/cppu/source/threadpool/thread.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,4 @@ namespace cppu_threadpool { #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/threadpool/threadident.cxx b/cppu/source/threadpool/threadident.cxx index 0fb6c1196185..50fef43f57b4 100644 --- a/cppu/source/threadpool/threadident.cxx +++ b/cppu/source/threadpool/threadident.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,5 @@ extern "C" sal_Bool SAL_CALL uno_bindIdToCurrentThread( sal_Sequence *pThreadId } return sal_True; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index b7df159a80b9..b21d0b758bc5 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" -#include <hash_set> +#include <boost/unordered_map.hpp> #include <stdio.h> #include <osl/diagnose.h> @@ -118,7 +119,7 @@ namespace cppu_threadpool ThreadPool::ThreadPool() { - m_DisposedCallerAdmin = DisposedCallerAdmin::getInstance(); + m_DisposedCallerAdmin = DisposedCallerAdmin::getInstance(); } ThreadPool::~ThreadPool() @@ -302,7 +303,7 @@ namespace cppu_threadpool if( ii == m_mapQueue.end() ) { - m_mapQueue[ aThreadId ] = pair < JobQueue * , JobQueue * > ( 0 , 0 ); + m_mapQueue[ aThreadId ] = pair < JobQueue * , JobQueue * > ( (JobQueue *)0 , (JobQueue*)0 ); ii = m_mapQueue.find( aThreadId ); OSL_ASSERT( ii != m_mapQueue.end() ); } @@ -348,7 +349,7 @@ namespace cppu_threadpool if( ii == m_mapQueue.end() ) { JobQueue *p = new JobQueue(); - m_mapQueue[ aThreadId ] = pair< JobQueue * , JobQueue * > ( p , 0 ); + m_mapQueue[ aThreadId ] = pair< JobQueue * , JobQueue * > ( p , (JobQueue*)0 ); } else if( 0 == (*ii).second.first ) { @@ -404,7 +405,7 @@ struct uno_ThreadPool_Hash -typedef ::std::hash_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet; +typedef ::boost::unordered_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet; static ThreadpoolHashSet *g_pThreadpoolHashSet; @@ -504,3 +505,5 @@ uno_threadpool_destroy( uno_ThreadPool hPool ) SAL_THROW_EXTERN_C() } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx index e1c9a127fa55..273798c81f8a 100644 --- a/cppu/source/threadpool/threadpool.hxx +++ b/cppu/source/threadpool/threadpool.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -24,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/conditn.h> @@ -59,7 +60,7 @@ namespace cppu_threadpool { } }; - typedef ::std::hash_map + typedef ::boost::unordered_map < ByteSequence, // ThreadID ::std::pair < JobQueue * , JobQueue * >, @@ -138,3 +139,5 @@ namespace cppu_threadpool { }; } // end namespace cppu_threadpool + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index 605bc5aadbdc..bc2f67c2fefb 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,7 +43,9 @@ using namespace osl; -using namespace rtl; + +using ::rtl::OUString; +using ::rtl::OUStringBuffer; extern "C" { @@ -67,8 +70,6 @@ void SAL_CALL typelib_typedescriptionreference_getByName( #ifdef SAL_W32 #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(8) #endif /** @@ -79,14 +80,19 @@ void SAL_CALL typelib_typedescriptionreference_getByName( */ struct AlignSize_Impl { - sal_Int16 nInt16; - double dDouble; + sal_Int16 nInt16; +#ifdef AIX + //double: doubleword aligned if -qalign=natural/-malign=natural + //which isn't the default ABI. Otherwise word aligned, While a long long int + //is always doubleword aligned, so use that instead. + sal_Int64 dDouble; +#else + double dDouble; +#endif }; #ifdef SAL_W32 #pragma pack(pop) -#elif defined(SAL_OS2) -#pragma pack() #endif // the value of the maximal alignment @@ -647,3 +653,5 @@ void SAL_CALL typelib_static_array_type_init( } // extern "C" } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 935a64397505..672502cec457 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,7 +29,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cppu.hxx" -#include <hash_map> +#if OSL_DEBUG_LEVEL > 1 +#include <stdio.h> +#endif + +#include <boost/unordered_map.hpp> #include <list> #include <set> #include <vector> @@ -48,17 +53,15 @@ #include <typelib/typedescription.h> #include <uno/any2.h> -using namespace rtl; using namespace std; using namespace osl; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; +using ::rtl::OString; -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ #ifdef SAL_W32 #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(8) #endif /** @@ -69,14 +72,19 @@ using namespace osl; */ struct AlignSize_Impl { - sal_Int16 nInt16; - double dDouble; + sal_Int16 nInt16; +#ifdef AIX + //double: doubleword aligned if -qalign=natural/-malign=natural + //which isn't the default ABI. Otherwise word aligned, While a long long int + //is always doubleword aligned, so use that instead. + sal_Int64 dDouble; +#else + double dDouble; +#endif }; #ifdef SAL_W32 #pragma pack(pop) -#elif defined(SAL_OS2) -#pragma pack() #endif // the value of the maximal alignment @@ -183,7 +191,7 @@ struct hashStr_Impl //----------------------------------------------------------------------------- // Heavy hack, the const sal_Unicode * is hold by the typedescription reference -typedef hash_map< const sal_Unicode *, typelib_TypeDescriptionReference *, +typedef boost::unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *, hashStr_Impl, equalStr_Impl > WeakMap_Impl; typedef pair< void *, typelib_typedescription_Callback > CallbackEntry; @@ -273,7 +281,7 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () ) while( aIt != pCache->end() ) { typelib_typedescription_release( (*aIt) ); - aIt++; + ++aIt; } delete pCache; pCache = 0; @@ -330,6 +338,21 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () ) delete pWeakMap; pWeakMap = 0; } +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( !nTypeDescriptionCount ); + OSL_ENSURE( !nCompoundTypeDescriptionCount ); + OSL_ENSURE( !nUnionTypeDescriptionCount ); + OSL_ENSURE( !nIndirectTypeDescriptionCount ); + OSL_ENSURE( !nArrayTypeDescriptionCount ); + OSL_ENSURE( !nEnumTypeDescriptionCount ); + OSL_ENSURE( !nInterfaceMethodTypeDescriptionCount ); + OSL_ENSURE( !nInterfaceAttributeTypeDescriptionCount ); + OSL_ENSURE( !nInterfaceTypeDescriptionCount ); + OSL_ENSURE( !nTypeDescriptionReferenceCount ); + + OSL_ENSURE( !pCallbacks || pCallbacks->empty() ); +#endif + delete pCallbacks; pCallbacks = 0; @@ -342,10 +365,6 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () ) namespace { struct Init : public rtl::Static< TypeDescriptor_Init_Impl, Init > {}; } -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ extern "C" void SAL_CALL typelib_typedescription_registerCallback( void * pContext, typelib_typedescription_Callback pCallback ) SAL_THROW_EXTERN_C() @@ -385,10 +404,6 @@ extern "C" void SAL_CALL typelib_typedescription_revokeCallback( } } - -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize( const typelib_TypeDescription * pTypeDescription, sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize ) @@ -1276,7 +1291,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod( sal_Int32 nOffset = rtl_ustr_lastIndexOfChar_WithLength( pTypeName->buffer, pTypeName->length, ':'); if (nOffset <= 0 || pTypeName->buffer[nOffset - 1] != ':') { - OSL_ENSURE(false, "Bad interface method type name"); + OSL_FAIL("Bad interface method type name"); return; } rtl::OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1); @@ -1289,7 +1304,7 @@ extern "C" void SAL_CALL typelib_typedescription_newInterfaceMethod( || !complete( reinterpret_cast< typelib_TypeDescription ** >(&pInterface), false)) { - OSL_ENSURE(false, "No interface corresponding to interface method"); + OSL_FAIL("No interface corresponding to interface method"); return; } @@ -1369,7 +1384,7 @@ extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute( sal_Int32 nOffset = rtl_ustr_lastIndexOfChar_WithLength( pTypeName->buffer, pTypeName->length, ':'); if (nOffset <= 0 || pTypeName->buffer[nOffset - 1] != ':') { - OSL_ENSURE(false, "Bad interface attribute type name"); + OSL_FAIL("Bad interface attribute type name"); return; } rtl::OUString aInterfaceTypeName(pTypeName->buffer, nOffset - 1); @@ -1382,7 +1397,7 @@ extern "C" void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute( || !complete( reinterpret_cast< typelib_TypeDescription ** >(&pInterface), false)) { - OSL_ENSURE(false, "No interface corresponding to interface attribute"); + OSL_FAIL("No interface corresponding to interface attribute"); return; } @@ -1927,7 +1942,13 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize( nSize = rMaxIntegralTypeSize = (sal_Int32)(sizeof( float )); break; case typelib_TypeClass_DOUBLE: +#ifdef AIX + //See previous AIX ifdef comment for an explanation + nSize = (sal_Int32)(sizeof(double)); + rMaxIntegralTypeSize = (sal_Int32)(sizeof(void*)); +#else nSize = rMaxIntegralTypeSize = (sal_Int32)(sizeof( double )); +#endif break; case typelib_TypeClass_BYTE: nSize = rMaxIntegralTypeSize = (sal_Int32)(sizeof( sal_Int8 )); @@ -1948,7 +1969,7 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize( case typelib_TypeClass_SERVICE: case typelib_TypeClass_MODULE: default: - OSL_ENSURE( sal_False, "not convertable type" ); + OSL_FAIL( "not convertable type" ); }; } @@ -2174,7 +2195,7 @@ extern "C" void SAL_CALL typelib_typedescription_getByName( { // Check for derived interface member type: sal_Int32 i1 = name.lastIndexOf( - rtl::OUString::createFromAscii(":@")); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":@"))); if (i1 >= 0) { sal_Int32 i2 = i1 + RTL_CONSTASCII_LENGTH(":@"); sal_Int32 i3 = name.indexOf(',', i2); @@ -2254,10 +2275,6 @@ extern "C" void SAL_CALL typelib_typedescription_getByName( } } - -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ extern "C" void SAL_CALL typelib_typedescriptionreference_newByAsciiName( typelib_TypeDescriptionReference ** ppTDR, typelib_TypeClass eTypeClass, @@ -2644,3 +2661,5 @@ extern "C" sal_Bool SAL_CALL typelib_typedescription_complete( { return complete(ppTypeDescr, true); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/EnvDcp.c b/cppu/source/uno/EnvDcp.c index 7fb9a0e0ee68..a9d6dc3d59c7 100644 --- a/cppu/source/uno/EnvDcp.c +++ b/cppu/source/uno/EnvDcp.c @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ void uno_EnvDcp_getPurpose(rtl_uString const * pEnvDcp, rtl_uString ** ppEnvPurp else rtl_uString_new(ppEnvPurpose); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx index b7cefd42b4da..d1ff2922233a 100644 --- a/cppu/source/uno/EnvStack.cxx +++ b/cppu/source/uno/EnvStack.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,10 +31,12 @@ #include "cppu/EnvDcp.hxx" #include "cppu/Enterable.hxx" +#include "rtl/instance.hxx" + #include "osl/thread.h" #include "osl/mutex.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace com::sun::star; @@ -62,14 +65,16 @@ size_t oslThreadIdentifier_hash::operator()(oslThreadIdentifier s1) const return s1; } -typedef ::std::hash_map<oslThreadIdentifier, +typedef ::boost::unordered_map<oslThreadIdentifier, uno_Environment *, oslThreadIdentifier_hash, oslThreadIdentifier_equal> ThreadMap; -static osl::Mutex s_threadMap_mutex; -static ThreadMap s_threadMap; - +namespace +{ + struct s_threadMap_mutex : public rtl::Static< osl::Mutex, s_threadMap_mutex > {}; + struct s_threadMap : public rtl::Static< ThreadMap, s_threadMap > {}; +} static rtl::OUString s_uno_envDcp(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO)); @@ -77,15 +82,13 @@ static void s_setCurrent(uno_Environment * pEnv) { oslThreadIdentifier threadId = osl_getThreadIdentifier(NULL); - osl::MutexGuard guard(s_threadMap_mutex); + osl::MutexGuard guard(s_threadMap_mutex::get()); + ThreadMap &rThreadMap = s_threadMap::get(); if (pEnv) - s_threadMap[threadId] = pEnv; + rThreadMap[threadId] = pEnv; else - { - ThreadMap::iterator iEnv = s_threadMap.find(threadId); - s_threadMap.erase(iEnv); - } + rThreadMap.erase(threadId); } static uno_Environment * s_getCurrent(void) @@ -94,9 +97,10 @@ static uno_Environment * s_getCurrent(void) oslThreadIdentifier threadId = osl_getThreadIdentifier(NULL); - osl::MutexGuard guard(s_threadMap_mutex); - ThreadMap::iterator iEnv = s_threadMap.find(threadId); - if(iEnv != s_threadMap.end()) + osl::MutexGuard guard(s_threadMap_mutex::get()); + ThreadMap &rThreadMap = s_threadMap::get(); + ThreadMap::iterator iEnv = rThreadMap.find(threadId); + if(iEnv != rThreadMap.end()) pEnv = iEnv->second; return pEnv; @@ -378,3 +382,5 @@ int SAL_CALL uno_Environment_isValid(uno_Environment * pEnv, rtl_uString ** pRea return result; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/IdentityMapping.cxx b/cppu/source/uno/IdentityMapping.cxx index 64721e2993ca..868a4d7c5e3c 100644 --- a/cppu/source/uno/IdentityMapping.cxx +++ b/cppu/source/uno/IdentityMapping.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ uno_Mapping * createIdentityMapping(uno::Environment const & rEnv) SAL_THROW(()) { return new IdentityMapping(rEnv); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/IdentityMapping.hxx b/cppu/source/uno/IdentityMapping.hxx index cf95a30b203c..cd9760640656 100644 --- a/cppu/source/uno/IdentityMapping.hxx +++ b/cppu/source/uno/IdentityMapping.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,3 +38,5 @@ class Environment; uno_Mapping * createIdentityMapping(const ::com::sun::star::uno::Environment & rEnv); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/any.cxx b/cppu/source/uno/any.cxx index 29be833dfb86..f83373ce4d5c 100644 --- a/cppu/source/uno/any.cxx +++ b/cppu/source/uno/any.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -148,3 +149,5 @@ void SAL_CALL uno_any_clear( uno_Any * pValue, uno_ReleaseFunc release ) CONSTRUCT_EMPTY_ANY( pValue ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx index 256bb31565db..42375832ab09 100644 --- a/cppu/source/uno/assign.hxx +++ b/cppu/source/uno/assign.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -633,3 +634,5 @@ inline sal_Bool _assignData( } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index ee870a52e286..9e32c6db8bc5 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/cppu/source/uno/cascade_mapping.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,22 +26,17 @@ * ************************************************************************/ -#include <iostream> - #include "osl/interlck.h" #include "rtl/ustring.hxx" #include "uno/environment.hxx" #include "uno/mapping.hxx" #include "uno/dispatcher.h" -//#include "cascade_mappping.hxx" #include "cppu/EnvDcp.hxx" -//#define LOG_CALLING_named_purpose_getMapping - -//#define LOG_LIFECYLE_MediatorMapping #ifdef LOG_LIFECYLE_MediatorMapping +# include <iostream> # define LOG_LIFECYLE_MediatorMapping_emit(x) x #else @@ -339,3 +335,5 @@ void getCascadeMapping(uno_Mapping ** ppMapping, *ppMapping = pMapping; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/cascade_mapping.hxx b/cppu/source/uno/cascade_mapping.hxx index 3b63e17198fb..9920fa05058d 100644 --- a/cppu/source/uno/cascade_mapping.hxx +++ b/cppu/source/uno/cascade_mapping.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,3 +40,5 @@ void getCascadeMapping(uno_Mapping ** ppMapping, rtl_uString * pAddPurpose ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx index 8e6d35e9db64..b8eb9b5cc5ce 100644 --- a/cppu/source/uno/constr.hxx +++ b/cppu/source/uno/constr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -265,3 +266,5 @@ inline void _defaultConstructData( } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx index 7999b5ae0d2b..eee6363e6998 100644 --- a/cppu/source/uno/copy.hxx +++ b/cppu/source/uno/copy.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -251,7 +252,7 @@ inline void _copyConstructAnyFromData( *(typelib_TypeDescriptionReference **)&pDestAny->pReserved = *(typelib_TypeDescriptionReference **)pSource; break; case typelib_TypeClass_ANY: - OSL_ENSURE( 0, "### unexpected nested any!" ); + OSL_FAIL( "### unexpected nested any!" ); break; case typelib_TypeClass_ENUM: pDestAny->pData = &pDestAny->pReserved; @@ -728,7 +729,7 @@ inline uno_Sequence * icopyConstructSequence( break; } default: - OSL_ENSURE( 0, "### unexepcted sequence element type!" ); + OSL_FAIL( "### unexepcted sequence element type!" ); pDest = 0; break; } @@ -884,3 +885,5 @@ inline void _copyConstructData( } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index bb2869ca037f..19da7a87fbc1 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,7 +109,7 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p #if OSL_DEBUG_LEVEL > 1 OUStringBuffer buf( 128 ); buf.appendAscii( - RTL_CONSTASCII_STRINGPARAM("### exception occured querying for interface ") ); + RTL_CONSTASCII_STRINGPARAM("### exception occurred querying for interface ") ); buf.append( * reinterpret_cast< OUString const * >( &pDestType->pTypeName ) ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(": [") ); buf.append( * reinterpret_cast< OUString const * >( &pExc->pType->pTypeName ) ); @@ -117,7 +118,7 @@ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * p buf.append( * reinterpret_cast< OUString const * >( pExc->pData ) ); OString cstr( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); - OSL_ENSURE( 0, cstr.getStr() ); + OSL_FAIL( cstr.getStr() ); #endif uno_any_destruct( pExc, 0 ); } @@ -276,7 +277,7 @@ sal_Bool SAL_CALL uno_type_equalData( { return _equalData( pVal1, pVal1Type, 0, - pVal2, pVal2Type, 0, + pVal2, pVal2Type, queryInterface, release ); } //################################################################################################## @@ -288,7 +289,7 @@ sal_Bool SAL_CALL uno_equalData( { return _equalData( pVal1, pVal1TD->pWeakRef, pVal1TD, - pVal2, pVal2TD->pWeakRef, pVal2TD, + pVal2, pVal2TD->pWeakRef, queryInterface, release ); } //################################################################################################## @@ -355,12 +356,11 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData( #if defined( SAL_W32) #pragma pack(push, 8) -#elif defined(SAL_OS2) -#pragma pack(push, 4) #endif #if defined(INTEL) \ - && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OS2)) || defined(MACOSX) \ + && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) \ + || defined(NETBSD) || defined(OPENBSD)) || defined(MACOSX) || defined(DRAGONFLY) \ || defined(__SUNPRO_CC) && defined(SOLARIS)) #define MAX_ALIGNMENT_4 #endif @@ -372,20 +372,8 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData( #define BINTEST_VERIFYOFFSET( s, m, n ) \ if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m ") = %" SAL_PRI_SIZET "u instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); } -#if OSL_DEBUG_LEVEL > 1 -#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && (defined(INTEL) || defined(POWERPC) || defined(X86_64) || defined(S390)) -#define BINTEST_VERIFYSIZE( s, n ) \ - fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \ - if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); } -#else // ! GNUC -#define BINTEST_VERIFYSIZE( s, n ) \ - fprintf( stderr, "> sizeof(" #s ") = %d\n", sizeof(s) ); \ - if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); } -#endif -#else // ! OSL_DEBUG_LEVEL #define BINTEST_VERIFYSIZE( s, n ) \ if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); } -#endif struct C1 { @@ -607,8 +595,6 @@ BinaryCompatible_Impl::BinaryCompatible_Impl() #ifdef SAL_W32 # pragma pack(pop) -#elif defined(SAL_OS2) -# pragma pack() #endif static BinaryCompatible_Impl aTest; @@ -616,3 +602,5 @@ static BinaryCompatible_Impl aTest; #endif } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx index 8f156038ade5..92da095f1ac1 100644 --- a/cppu/source/uno/destr.hxx +++ b/cppu/source/uno/destr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -146,12 +147,12 @@ inline void _destructAny( (typelib_TypeDescriptionReference *)pAny->pReserved ); break; case typelib_TypeClass_ANY: - OSL_ENSURE( sal_False, "### unexpected nested any!" ); + OSL_FAIL( "### unexpected nested any!" ); ::uno_any_destruct( (uno_Any *)pAny->pData, release ); ::rtl_freeMemory( pAny->pData ); break; case typelib_TypeClass_TYPEDEF: - OSL_ENSURE( 0, "### unexpected typedef!" ); + OSL_FAIL( "### unexpected typedef!" ); break; case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: @@ -380,7 +381,7 @@ inline void _destructData( _destructAny( (uno_Any *)pValue, release ); break; case typelib_TypeClass_TYPEDEF: - OSL_ENSURE( 0, "### unexpected typedef!" ); + OSL_FAIL( "### unexpected typedef!" ); break; case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: @@ -436,3 +437,5 @@ inline void _destructData( } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/env_subst.cxx b/cppu/source/uno/env_subst.cxx index 4465a9e1815e..6d75a35b662b 100644 --- a/cppu/source/uno/env_subst.cxx +++ b/cppu/source/uno/env_subst.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ void SAL_CALL uno_getEnvironment(uno_Environment ** ppEnv, uno_direct_getEnvironment(ppEnv, envDcp.pData, pContext); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/env_subst.hxx b/cppu/source/uno/env_subst.hxx index 8ee8631ced84..b0118a532403 100644 --- a/cppu/source/uno/env_subst.hxx +++ b/cppu/source/uno/env_subst.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,3 +40,5 @@ extern "C" void SAL_CALL uno_direct_getEnvironment(uno_Environment ** ppEnv, #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx index 45bc0e79cfaa..fef81033cfa5 100644 --- a/cppu/source/uno/eq.hxx +++ b/cppu/source/uno/eq.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -302,7 +303,7 @@ inline sal_Bool _equalData( void * pDest, typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr, void * pSource, - typelib_TypeDescriptionReference * pSourceType, typelib_TypeDescription * pSourceTypeDescr, + typelib_TypeDescriptionReference * pSourceType, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) SAL_THROW( () ) { @@ -315,7 +316,6 @@ inline sal_Bool _equalData( } while (typelib_TypeClass_ANY == (eSourceTypeClass = pSourceType->eTypeClass)) { - pSourceTypeDescr = 0; pSourceType = ((uno_Any *)pSource)->pType; pSource = ((uno_Any *)pSource)->pData; } @@ -666,3 +666,5 @@ inline sal_Bool _equalData( } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index f9e382d7e7a5..651e6862fba7 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,7 +51,7 @@ #include "destr.hxx" #include "loadmodule.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <stdio.h> @@ -119,16 +120,16 @@ struct FctOUStringHash : }; // mapping from environment name to environment -typedef ::std::hash_map< +typedef ::boost::unordered_map< OUString, uno_Environment *, FctOUStringHash, ::std::equal_to< OUString > > OUString2EnvironmentMap; // mapping from ptr to object entry -typedef ::std::hash_map< +typedef ::boost::unordered_map< void *, ObjectEntry *, FctPtrHash, ::std::equal_to< void * > > Ptr2ObjectMap; // mapping from oid to object entry -typedef ::std::hash_map< +typedef ::boost::unordered_map< OUString, ObjectEntry *, FctOUStringHash, ::std::equal_to< OUString > > OId2ObjectMap; @@ -269,7 +270,7 @@ static void SAL_CALL defenv_registerInterface( // try to insert dummy 0: std::pair<OId2ObjectMap::iterator, bool> const insertion( - that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, 0 ) ) ); + that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, (ObjectEntry*)0 ) ) ); if (insertion.second) { ObjectEntry * pOEntry = new ObjectEntry( rOId ); @@ -317,7 +318,7 @@ static void SAL_CALL defenv_registerProxyInterface( // try to insert dummy 0: std::pair<OId2ObjectMap::iterator, bool> const insertion( - that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, 0 ) ) ); + that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, (ObjectEntry*)0 ) ) ); if (insertion.second) { ObjectEntry * pOEntry = new ObjectEntry( rOId ); @@ -686,8 +687,7 @@ static void writeLine( } else { - OSL_TRACE( pLine ); - OSL_TRACE( "\n" ); + OSL_TRACE( "%s\n", pLine ); } } } @@ -825,14 +825,14 @@ extern "C" void SAL_CALL uno_dumpEnvironmentByName( } } -//------------------------------------------------------------------------------ -inline static const OUString & unoenv_getStaticOIdPart() +namespace { - static OUString * s_pStaticOidPart = 0; - if (! s_pStaticOidPart) + class makeOIdPart { - ::osl::MutexGuard guard( ::osl::Mutex::getGlobalMutex() ); - if (! s_pStaticOidPart) + private: + OUString m_sOidPart; + public: + makeOIdPart() { ::rtl::OUStringBuffer aRet( 64 ); aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM("];") ); @@ -856,11 +856,18 @@ inline static const OUString & unoenv_getStaticOIdPart() for ( sal_Int32 i = 0; i < 16; ++i ) aRet.append( (sal_Int32)ar[i], 16 ); - static OUString s_aStaticOidPart( aRet.makeStringAndClear() ); - s_pStaticOidPart = &s_aStaticOidPart; + m_sOidPart = aRet.makeStringAndClear(); } - } - return *s_pStaticOidPart; + const OUString& getOIdPart() const { return m_sOidPart; } + }; + + class theStaticOIdPart : public rtl::Static<makeOIdPart, theStaticOIdPart> {}; +} + +//------------------------------------------------------------------------------ +inline static const OUString & unoenv_getStaticOIdPart() +{ + return theStaticOIdPart::get().getOIdPart(); } extern "C" @@ -1185,3 +1192,4 @@ void SAL_CALL uno_getRegisteredEnvironments( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index d2c4a6f60641..0d3664c1a3da 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,7 +31,7 @@ #include "IdentityMapping.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <set> #include <algorithm> @@ -56,9 +57,11 @@ using namespace std; using namespace osl; -using namespace rtl; using namespace com::sun::star::uno; - +using ::rtl::OUString; +using ::rtl::OUStringBuffer; +using ::rtl::OUStringToOString; +using ::rtl::OString; namespace cppu { @@ -68,7 +71,7 @@ class Mapping uno_Mapping * _pMapping; public: - inline Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW( () ); + inline explicit Mapping( uno_Mapping * pMapping = 0 ) SAL_THROW( () ); inline Mapping( const Mapping & rMapping ) SAL_THROW( () ); inline ~Mapping() SAL_THROW( () ); inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping ) SAL_THROW( () ); @@ -129,21 +132,21 @@ struct MappingEntry {} }; //-------------------------------------------------------------------------------------------------- -struct FctOUStringHash : public unary_function< const OUString &, size_t > +struct FctOUStringHash : public std::unary_function< const OUString &, size_t > { size_t operator()( const OUString & rKey ) const SAL_THROW( () ) { return (size_t)rKey.hashCode(); } }; //-------------------------------------------------------------------------------------------------- -struct FctPtrHash : public unary_function< uno_Mapping *, size_t > +struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t > { size_t operator()( uno_Mapping * pKey ) const SAL_THROW( () ) { return (size_t)pKey; } }; -typedef hash_map< +typedef boost::unordered_map< OUString, MappingEntry *, FctOUStringHash, equal_to< OUString > > t_OUString2Entry; -typedef hash_map< +typedef boost::unordered_map< uno_Mapping *, MappingEntry *, FctPtrHash, equal_to< uno_Mapping * > > t_Mapping2Entry; typedef set< uno_getMappingFunc > t_CallbackSet; @@ -690,3 +693,4 @@ void SAL_CALL uno_revokeMappingCallback( } } // extern "C" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/loadmodule.cxx b/cppu/source/uno/loadmodule.cxx index e6858d247f04..ecc3ad9ce656 100644 --- a/cppu/source/uno/loadmodule.cxx +++ b/cppu/source/uno/loadmodule.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,6 +41,9 @@ namespace cppu { namespace detail { ::oslModule loadModule(rtl::OUString const & name) { +#ifdef IOS + return NULL; +#else rtl::OUStringBuffer b; #if defined SAL_DLLPREFIX b.appendAscii(RTL_CONSTASCII_STRINGPARAM(SAL_DLLPREFIX)); @@ -50,6 +54,9 @@ namespace cppu { namespace detail { reinterpret_cast< oslGenericFunction >(&loadModule), b.makeStringAndClear().pData, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY); +#endif } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/loadmodule.hxx b/cppu/source/uno/loadmodule.hxx index 77a9bb8d6dc0..fc3ec6dbbbe3 100644 --- a/cppu/source/uno/loadmodule.hxx +++ b/cppu/source/uno/loadmodule.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ namespace cppu { namespace detail { } } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx index 4acafd125d55..81f6f3148173 100644 --- a/cppu/source/uno/prim.hxx +++ b/cppu/source/uno/prim.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,22 +29,16 @@ #define PRIM_HXX #include "typelib/typedescription.h" -#ifndef _typelib_TypeClass_H_ #include "typelib/typeclass.h" -#endif #include "uno/sequence2.h" #include "uno/any2.h" #include "uno/data.h" #include "uno/mapping.h" #include "uno/dispatcher.h" -#ifndef _OSL_INTERLCK_H #include "osl/interlck.h" -#endif #include "osl/diagnose.h" -#ifndef _RTL_USTRING_HXX #include "rtl/ustring.hxx" -#endif #include "rtl/alloc.h" #if OSL_DEBUG_LEVEL > 1 @@ -204,3 +199,5 @@ inline sal_Bool _type_equals( } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx index 933d38fc6b4f..6374c773cb86 100644 --- a/cppu/source/uno/sequence.cxx +++ b/cppu/source/uno/sequence.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -350,7 +351,7 @@ static inline bool idefaultConstructElements( } break; default: - OSL_ENSURE( 0, "### unexpected element type!" ); + OSL_FAIL( "### unexpected element type!" ); pSeq = 0; break; } @@ -664,7 +665,7 @@ static inline bool icopyConstructFromElements( break; } default: - OSL_ENSURE( 0, "### unexpected element type!" ); + OSL_FAIL( "### unexpected element type!" ); pSeq = 0; break; } @@ -1014,3 +1015,5 @@ void SAL_CALL uno_type_sequence_assign( } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk index f013516480fc..8c6d6944e0ad 100644 --- a/cppu/util/extra.mk +++ b/cppu/util/extra.mk @@ -44,13 +44,7 @@ SHL3TARGET := unsafe_uno_uno SHL3IMPLIB := i$(SHL3TARGET) SHL3STDLIBS := $(purpenv_helper_LIB) $(SALLIB) SHL3OBJS := $(SLO)$/UnsafeBridge.obj -.IF "$(GUI)"=="OS2" -SHL3VERSIONMAP=unsafe_os2.map -SHL3DEF=$(MISC)$/$(SHL3TARGET).def -DEF3NAME=$(SHL3TARGET) -.ELSE SHL3DEF := empty.def -.ENDIF SHL3OBJS := $(SLO)$/UnsafeBridge.obj SHL3RPATH := URELIB @@ -58,13 +52,7 @@ SHL4TARGET := affine_uno_uno SHL4IMPLIB := i$(SHL4TARGET) SHL4STDLIBS := $(purpenv_helper_LIB) $(SALLIB) SHL4OBJS := $(SLO)$/AffineBridge.obj -.IF "$(GUI)"=="OS2" -SHL4VERSIONMAP=unsafe_os2.map -SHL4DEF=$(MISC)$/$(SHL4TARGET).def -DEF4NAME=$(SHL4TARGET) -.ELSE SHL4DEF := empty.def -.ENDIF SHL4OBJS := $(SLO)$/AffineBridge.obj SHL4RPATH := URELIB @@ -74,13 +62,7 @@ SHL5IMPLIB := i$(SHL5TARGET) SHL5STDLIBS := $(purpenv_helper_LIB) $(SALLIB) $(CPPULIB) SHL5OBJS := $(SLO)$/LogBridge.obj -.IF "$(GUI)"=="OS2" -SHL5VERSIONMAP=unsafe_os2.map -SHL5DEF=$(MISC)$/$(SHL5TARGET).def -DEF5NAME=LogMapping.def -.ELSE SHL5DEF := empty.def -.ENDIF SHL5RPATH := URELIB # --- Targets ------------------------------------------------------ diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index 2e52c28b5193..f8ae76e8dd7a 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -50,7 +50,7 @@ SHL1LIBS= \ $(SLB)$/cppu_threadpool.lib \ $(SLB)$/cppu_cppu.lib -.IF "$(GUI)" == "WNT" || "$(GUI)"=="OS2" +.IF "$(GUI)" == "WNT" SHL1TARGET=$(TARGET)$(UDK_MAJOR) .ELSE SHL1TARGET= uno_$(TARGET) @@ -60,7 +60,7 @@ SHL1STDLIBS = $(SALLIB) SHL1DEPN= SHL1IMPLIB=i$(TARGET) -.IF "$(OS)"!="FREEBSD" +.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY" SHL1DEF=$(MISC)$/$(SHL1TARGET).def .ENDIF @@ -74,8 +74,8 @@ SHL2TARGET := $(NAMEpurpenv_helper) DEF2NAME := $(SHL2TARGET) .IF "$(GUI)$(COM)"=="WNTGCC" SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map -.ELIF "$(GUI)"=="OS2" -SHL2VERSIONMAP:=uno_purpenvhelperwntgcc.map +.ELIF "$(COMNAME)"=="mscx" +SHL2VERSIONMAP:=$(SHL2TARGET)X.map .ELSE SHL2VERSIONMAP:=$(SHL2TARGET).map .ENDIF # "$(GUI)$(COM)"=="WNTGCC" @@ -87,19 +87,10 @@ SHL2OBJS := \ $(SLO)$/helper_purpenv_Environment.obj \ $(SLO)$/helper_purpenv_Mapping.obj \ $(SLO)$/helper_purpenv_Proxy.obj - +SHL2DEPN=$(SHL1TARGETN) # --- Targets ------------------------------------------------------ - -.PHONY: ALLTAR - - -ALLTAR: $(SHL2TARGETN) - $(MAKE) $(MAKECMDGOALS) -f extra.mk - - .INCLUDE : target.mk - -$(SHL2TARGETN): $(SHL1TARGETN) - +ALLTAR: + $(MAKE) $(MAKECMDGOALS) -f extra.mk diff --git a/cppu/util/makefile.pmk b/cppu/util/makefile.pmk index c1259ddf4a10..95e83db6dc07 100644 --- a/cppu/util/makefile.pmk +++ b/cppu/util/makefile.pmk @@ -26,7 +26,3 @@ #************************************************************************* ENABLE_EXCEPTIONS=TRUE NO_BSYMBOLIC=TRUE - -.IF "$(GUI)" == "OS2" -STL_OS2_BUILDING=1 -.ENDIF diff --git a/cppu/util/purpenvhelper3MSCX.map b/cppu/util/purpenvhelper3MSCX.map new file mode 100644 index 000000000000..22485191c805 --- /dev/null +++ b/cppu/util/purpenvhelper3MSCX.map @@ -0,0 +1,8 @@ +UDK_3_0_0 { + global: + ?Environment_initWithEnterable@purpenv@helper@cppu@@YAXPEAU_uno_Environment@@PEAVEnterable@3@@Z; + ?createMapping@purpenv@helper@cppu@@YAXPEAPEAU_uno_Mapping@@PEAU_uno_Environment@@1P6AX_NPEAX3PEAU_typelib_TypeDescriptionReference@@PEAU_typelib_MethodParameter@@JPEBU_typelib_TypeDescription@@3QEAPEAXPEAPEAU_uno_Any@@@Z3@Z; + + local: + *; +}; diff --git a/cppu/util/target.pmk b/cppu/util/target.pmk index 3befcb154753..a94ea7c8dafe 100644 --- a/cppu/util/target.pmk +++ b/cppu/util/target.pmk @@ -51,3 +51,7 @@ CFLAGS += -Ob0 .ENDIF .ENDIF + +.IF "$(COM)$(CPU)" == "MSCX" +CFLAGS += -DCPPU_LEAK_STATIC_DATA +.ENDIF |