From d8344847a2777ec5fddc8c67a262270234cf76ab Mon Sep 17 00:00:00 2001 From: Daniel Boelzle Date: Wed, 21 Aug 2002 08:19:40 +0000 Subject: #102391# cleaning up __ symbols --- cppu/inc/com/sun/star/uno/Reference.h | 42 +++++------ cppu/inc/com/sun/star/uno/Reference.hxx | 72 +++++++++--------- cppu/inc/com/sun/star/uno/Type.h | 8 +- cppu/inc/com/sun/star/uno/Type.hxx | 6 +- cppu/inc/typelib/typedescription.h | 22 +++--- cppu/inc/uno/lbnames.h | 22 +++--- cppu/source/cppu/cppu_opt.cxx | 6 +- cppu/source/typelib/static_types.cxx | 18 ++--- cppu/source/uno/any.cxx | 38 +++++----- cppu/source/uno/assign.hxx | 128 ++++++++++++++++++-------------- cppu/source/uno/constr.hxx | 45 +++++------ cppu/source/uno/copy.hxx | 109 ++++++++++++++------------- cppu/source/uno/data.cxx | 50 ++++++------- cppu/source/uno/destr.hxx | 61 ++++++++------- cppu/source/uno/eq.hxx | 90 +++++++++++----------- cppu/source/uno/lbenv.cxx | 10 +-- cppu/source/uno/prim.hxx | 35 ++++----- cppu/source/uno/sequence.cxx | 76 ++++++++++--------- cppu/test/alignment/diagnose.h | 18 ++--- cppu/util/cppu.map | 2 +- 20 files changed, 441 insertions(+), 417 deletions(-) (limited to 'cppu') diff --git a/cppu/inc/com/sun/star/uno/Reference.h b/cppu/inc/com/sun/star/uno/Reference.h index 88422a175f44..25c774f016f6 100644 --- a/cppu/inc/com/sun/star/uno/Reference.h +++ b/cppu/inc/com/sun/star/uno/Reference.h @@ -2,9 +2,9 @@ * * $RCSfile: Reference.h,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: dbo $ $Date: 2002-08-19 07:18:44 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ class Any; Deprecated, please use SAL_NO_ACQUIRE. @deprecated */ -enum __UnoReference_NoAcquire +enum UnoReference_NoAcquire { /** This enum value can be used for creating a reference granting a given interface, i.e. transferring ownership to it. @@ -108,7 +108,7 @@ protected: @param rType interface type @return interface of demanded type (may be null) */ - inline static XInterface * SAL_CALL __query( XInterface * pInterface, const Type & rType ) + inline static XInterface * SAL_CALL iquery( XInterface * pInterface, const Type & rType ) SAL_THROW( (RuntimeException) ); #ifndef EXCEPTIONS_OFF /** Queries given interface for type rType. @@ -118,7 +118,7 @@ protected: @param rType interface type @return interface of demanded type */ - inline static XInterface * SAL_CALL __query_throw( XInterface * pInterface, const Type & rType ) + inline static XInterface * SAL_CALL iquery_throw( XInterface * pInterface, const Type & rType ) SAL_THROW( (RuntimeException) ); #endif @@ -176,7 +176,7 @@ public: /** Enum defining UNO_QUERY and UNO_REF_QUERY for implicit interface query. */ -enum __UnoReference_Query +enum UnoReference_Query { /** This enum value can be used for implicit interface query. */ @@ -189,7 +189,7 @@ enum __UnoReference_Query /** Enum defining UNO_QUERY_THROW and UNO_REF_QUERY_THROW for implicit interface query. If the demanded interface is unavailable, then a RuntimeException is thrown. */ -enum __UnoReference_QueryThrow +enum UnoReference_QueryThrow { /** This enum value can be used for implicit interface query. */ @@ -212,7 +212,7 @@ class Reference : public BaseReference @param pInterface interface pointer @return interface of demanded type (may be null) */ - inline static interface_type * SAL_CALL __query( XInterface * pInterface ) + inline static interface_type * SAL_CALL iquery( XInterface * pInterface ) SAL_THROW( (RuntimeException) ); #ifndef EXCEPTIONS_OFF /** Queries given interface for type interface_type. @@ -221,7 +221,7 @@ class Reference : public BaseReference @param pInterface interface pointer @return interface of demanded type */ - inline static interface_type * SAL_CALL __query_throw( XInterface * pInterface ) + inline static interface_type * SAL_CALL iquery_throw( XInterface * pInterface ) SAL_THROW( (RuntimeException) ); #endif @@ -272,26 +272,26 @@ public: @param pInterface another reference @param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to other constructors */ - inline Reference( interface_type * pInterface, __UnoReference_NoAcquire ) SAL_THROW( () ); + inline Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () ); /** Constructor: Queries given interface for reference interface type (interface_type). @param rRef another reference @param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction to other constructors */ - inline Reference( const BaseReference & rRef, __UnoReference_Query ) SAL_THROW( (RuntimeException) ); + inline Reference( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given interface for reference interface type (interface_type). @param pInterface an interface pointer @param dummy UNO_QUERY to force obvious distinction to other constructors */ - inline Reference( XInterface * pInterface, __UnoReference_Query ) SAL_THROW( (RuntimeException) ); + inline Reference( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given any for reference interface type (interface_type). @param rAny an any @param dummy UNO_QUERY to force obvious distinction to other constructors */ - inline Reference( const Any & rAny, __UnoReference_Query ) SAL_THROW( (RuntimeException) ); + inline Reference( const Any & rAny, UnoReference_Query ) SAL_THROW( (RuntimeException) ); #ifndef EXCEPTIONS_OFF /** Constructor: Queries given interface for reference interface type (interface_type). Throws a RuntimeException if the demanded interface cannot be queried. @@ -300,7 +300,7 @@ public: @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction to other constructors */ - inline Reference( const BaseReference & rRef, __UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); + inline Reference( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given interface for reference interface type (interface_type). Throws a RuntimeException if the demanded interface cannot be queried. @@ -308,7 +308,7 @@ public: @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction to other constructors */ - inline Reference( XInterface * pInterface, __UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); + inline Reference( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); /** Constructor: Queries given any for reference interface type (interface_type). Throws a RuntimeException if the demanded interface cannot be queried. @@ -316,7 +316,7 @@ public: @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction to other constructors */ - inline Reference( const Any & rAny, __UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); + inline Reference( const Any & rAny, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); #endif /** Cast operator to Reference< XInterface >: Reference objects are binary compatible and @@ -372,7 +372,7 @@ public: @param dummy UNO_REF_NO_ACQUIRE to force obvious distinction to set methods @return true, if non-null interface was set */ - inline sal_Bool SAL_CALL set( interface_type * pInterface, __UnoReference_NoAcquire ) SAL_THROW( () ); + inline sal_Bool SAL_CALL set( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () ); /** Queries given interface for reference interface type (interface_type) and sets it. An interface already set will be released. @@ -381,7 +381,7 @@ public: @param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction to set methods @return true, if non-null interface was set */ - inline sal_Bool SAL_CALL set( XInterface * pInterface, __UnoReference_Query ) SAL_THROW( (RuntimeException) ); + inline sal_Bool SAL_CALL set( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ); /** Queries given interface for reference interface type (interface_type) and sets it. An interface already set will be released. @@ -389,7 +389,7 @@ public: @param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction to set methods @return true, if non-null interface was set */ - inline sal_Bool SAL_CALL set( const BaseReference & rRef, __UnoReference_Query ) SAL_THROW( (RuntimeException) ); + inline sal_Bool SAL_CALL set( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ); #ifndef EXCEPTIONS_OFF /** Queries given interface for reference interface type (interface_type) and sets it. An interface already set will be released. @@ -399,7 +399,7 @@ public: @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction to set methods */ - inline void SAL_CALL set( XInterface * pInterface, __UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); + inline void SAL_CALL set( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); /** Queries given interface for reference interface type (interface_type) and sets it. An interface already set will be released. Throws a RuntimeException if the demanded interface cannot be set. @@ -408,7 +408,7 @@ public: @param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious distinction to set methods */ - inline void SAL_CALL set( const BaseReference & rRef, __UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); + inline void SAL_CALL set( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ); #endif /** Assignment operator: Acquires given interface pointer and sets reference. diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx b/cppu/inc/com/sun/star/uno/Reference.hxx index 3ec7ff2b0948..3da60e64c9cb 100644 --- a/cppu/inc/com/sun/star/uno/Reference.hxx +++ b/cppu/inc/com/sun/star/uno/Reference.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Reference.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: dbo $ $Date: 2002-08-19 07:18:44 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,7 +81,7 @@ namespace uno { //__________________________________________________________________________________________________ -inline XInterface * BaseReference::__query( +inline XInterface * BaseReference::iquery( XInterface * pInterface, const Type & rType ) SAL_THROW( (RuntimeException) ) { @@ -99,36 +99,36 @@ inline XInterface * BaseReference::__query( } //__________________________________________________________________________________________________ template< class interface_type > -inline interface_type * Reference< interface_type >::__query( +inline interface_type * Reference< interface_type >::iquery( XInterface * pInterface ) SAL_THROW( (RuntimeException) ) { return static_cast< interface_type * >( - BaseReference::__query( + BaseReference::iquery( pInterface, ::getCppuType( (const Reference< interface_type > *)0 ) ) ); } #ifndef EXCEPTIONS_OFF -extern "C" rtl_uString * SAL_CALL __cppu_unsatisfied_query_msg( +extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg( typelib_TypeDescriptionReference * pType ) SAL_THROW_EXTERN_C(); //__________________________________________________________________________________________________ -inline XInterface * BaseReference::__query_throw( +inline XInterface * BaseReference::iquery_throw( XInterface * pInterface, const Type & rType ) SAL_THROW( (RuntimeException) ) { - XInterface * pQueried = __query( pInterface, rType ); + XInterface * pQueried = iquery( pInterface, rType ); if (pQueried) return pQueried; throw RuntimeException( - ::rtl::OUString( __cppu_unsatisfied_query_msg( rType.getTypeLibType() ), SAL_NO_ACQUIRE ), + ::rtl::OUString( cppu_unsatisfied_iquery_msg( rType.getTypeLibType() ), SAL_NO_ACQUIRE ), Reference< XInterface >( pInterface ) ); } //__________________________________________________________________________________________________ template< class interface_type > -inline interface_type * Reference< interface_type >::__query_throw( +inline interface_type * Reference< interface_type >::iquery_throw( XInterface * pInterface ) SAL_THROW( (RuntimeException) ) { return static_cast< interface_type * >( - BaseReference::__query_throw( + BaseReference::iquery_throw( pInterface, ::getCppuType( (const Reference< interface_type > *)0 ) ) ); } #endif @@ -170,48 +170,48 @@ inline Reference< interface_type >::Reference( interface_type * pInterface, __sa } //__________________________________________________________________________________________________ template< class interface_type > -inline Reference< interface_type >::Reference( interface_type * pInterface, __UnoReference_NoAcquire ) SAL_THROW( () ) +inline Reference< interface_type >::Reference( interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () ) { _pInterface = pInterface; } //__________________________________________________________________________________________________ template< class interface_type > -inline Reference< interface_type >::Reference( const BaseReference & rRef, __UnoReference_Query ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ) { - _pInterface = __query( rRef.get() ); + _pInterface = iquery( rRef.get() ); } //__________________________________________________________________________________________________ template< class interface_type > -inline Reference< interface_type >::Reference( XInterface * pInterface, __UnoReference_Query ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ) { - _pInterface = __query( pInterface ); + _pInterface = iquery( pInterface ); } //__________________________________________________________________________________________________ template< class interface_type > -inline Reference< interface_type >::Reference( const Any & rAny, __UnoReference_Query ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_Query ) SAL_THROW( (RuntimeException) ) { _pInterface = (typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass - ? __query( reinterpret_cast< XInterface * >( rAny.pReserved ) ) : 0); + ? iquery( reinterpret_cast< XInterface * >( rAny.pReserved ) ) : 0); } #ifndef EXCEPTIONS_OFF //__________________________________________________________________________________________________ template< class interface_type > -inline Reference< interface_type >::Reference( const BaseReference & rRef, __UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) { - _pInterface = __query_throw( rRef.get() ); + _pInterface = iquery_throw( rRef.get() ); } //__________________________________________________________________________________________________ template< class interface_type > -inline Reference< interface_type >::Reference( XInterface * pInterface, __UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) { - _pInterface = __query_throw( pInterface ); + _pInterface = iquery_throw( pInterface ); } //__________________________________________________________________________________________________ template< class interface_type > -inline Reference< interface_type >::Reference( const Any & rAny, __UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) +inline Reference< interface_type >::Reference( const Any & rAny, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) { - _pInterface = __query_throw( typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass - ? reinterpret_cast< XInterface * >( rAny.pReserved ) : 0 ); + _pInterface = iquery_throw( typelib_TypeClass_INTERFACE == rAny.pType->eTypeClass + ? reinterpret_cast< XInterface * >( rAny.pReserved ) : 0 ); } #endif @@ -250,7 +250,7 @@ inline sal_Bool Reference< interface_type >::set( //__________________________________________________________________________________________________ template< class interface_type > inline sal_Bool Reference< interface_type >::set( - interface_type * pInterface, __UnoReference_NoAcquire ) SAL_THROW( () ) + interface_type * pInterface, UnoReference_NoAcquire ) SAL_THROW( () ) { return set( pInterface, SAL_NO_ACQUIRE ); } @@ -265,31 +265,31 @@ inline sal_Bool Reference< interface_type >::set( //__________________________________________________________________________________________________ template< class interface_type > inline sal_Bool Reference< interface_type >::set( - XInterface * pInterface, __UnoReference_Query ) SAL_THROW( (RuntimeException) ) + XInterface * pInterface, UnoReference_Query ) SAL_THROW( (RuntimeException) ) { - return set( __query( pInterface ), SAL_NO_ACQUIRE ); + return set( iquery( pInterface ), SAL_NO_ACQUIRE ); } //__________________________________________________________________________________________________ template< class interface_type > inline sal_Bool Reference< interface_type >::set( - const BaseReference & rRef, __UnoReference_Query ) SAL_THROW( (RuntimeException) ) + const BaseReference & rRef, UnoReference_Query ) SAL_THROW( (RuntimeException) ) { - return set( __query( rRef.get() ), SAL_NO_ACQUIRE ); + return set( iquery( rRef.get() ), SAL_NO_ACQUIRE ); } #ifndef EXCEPTIONS_OFF //__________________________________________________________________________________________________ template< class interface_type > inline void Reference< interface_type >::set( - XInterface * pInterface, __UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) + XInterface * pInterface, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) { - set( __query_throw( pInterface ), SAL_NO_ACQUIRE ); + set( iquery_throw( pInterface ), SAL_NO_ACQUIRE ); } //__________________________________________________________________________________________________ template< class interface_type > inline void Reference< interface_type >::set( - const BaseReference & rRef, __UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) + const BaseReference & rRef, UnoReference_QueryThrow ) SAL_THROW( (RuntimeException) ) { - set( __query_throw( rRef.get() ), SAL_NO_ACQUIRE ); + set( iquery_throw( rRef.get() ), SAL_NO_ACQUIRE ); } #endif @@ -315,14 +315,14 @@ template< class interface_type > inline Reference< interface_type > Reference< interface_type >::query( const BaseReference & rRef ) SAL_THROW( (RuntimeException) ) { - return Reference< interface_type >( __query( rRef.get() ), SAL_NO_ACQUIRE ); + return Reference< interface_type >( iquery( rRef.get() ), SAL_NO_ACQUIRE ); } //__________________________________________________________________________________________________ template< class interface_type > inline Reference< interface_type > Reference< interface_type >::query( XInterface * pInterface ) SAL_THROW( (RuntimeException) ) { - return Reference< interface_type >( __query( pInterface ), SAL_NO_ACQUIRE ); + return Reference< interface_type >( iquery( pInterface ), SAL_NO_ACQUIRE ); } //################################################################################################## diff --git a/cppu/inc/com/sun/star/uno/Type.h b/cppu/inc/com/sun/star/uno/Type.h index 649bdd378de8..9d78b08438ef 100644 --- a/cppu/inc/com/sun/star/uno/Type.h +++ b/cppu/inc/com/sun/star/uno/Type.h @@ -2,9 +2,9 @@ * * $RCSfile: Type.h,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: dbo $ $Date: 2002-08-19 07:18:45 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:07 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,7 +90,7 @@ namespace uno /** Enum defining UNO_TYPE_NO_ACQUIRE for type description reference transfer. */ -enum __UnoType_NoAcquire +enum UnoType_NoAcquire { /** This enum value can be used for creating a Type object granting a given type description reference, i.e. transferring ownership to it. @@ -157,7 +157,7 @@ public: @param pType C type description reference @param dummy UNO_TYPE_NO_ACQUIRE to force obvious distinction to other constructors */ - inline Type( typelib_TypeDescriptionReference * pType, __UnoType_NoAcquire ) SAL_THROW( () ); + inline Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW( () ); /** Constructor: Type is (copy) constructed by given C type description reference without acquiring it. diff --git a/cppu/inc/com/sun/star/uno/Type.hxx b/cppu/inc/com/sun/star/uno/Type.hxx index 97690595514c..41ff5837911d 100644 --- a/cppu/inc/com/sun/star/uno/Type.hxx +++ b/cppu/inc/com/sun/star/uno/Type.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Type.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: dbo $ $Date: 2002-06-20 11:04:52 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,7 +105,7 @@ inline Type::Type( typelib_TypeDescriptionReference * pType ) SAL_THROW( () ) ::typelib_typedescriptionreference_acquire( _pType ); } //__________________________________________________________________________________________________ -inline Type::Type( typelib_TypeDescriptionReference * pType, __UnoType_NoAcquire ) SAL_THROW( () ) +inline Type::Type( typelib_TypeDescriptionReference * pType, UnoType_NoAcquire ) SAL_THROW( () ) : _pType( pType ) { } diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h index 81cbb3976000..8f510482b7da 100644 --- a/cppu/inc/typelib/typedescription.h +++ b/cppu/inc/typelib/typedescription.h @@ -2,9 +2,9 @@ * * $RCSfile: typedescription.h,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: dbo $ $Date: 2001-11-09 09:14:30 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -701,21 +701,21 @@ void SAL_CALL typelib_typedescription_revokeCallback( */ #define TYPELIB_DANGER_GET( ppDescription, pTypeRef ) \ { \ - typelib_TypeDescriptionReference * __pMacroTypeRef = (pTypeRef); \ - typelib_TypeDescription ** __ppMacroTypeDescr = (ppDescription); \ - if (TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( __pMacroTypeRef->eTypeClass )) \ + typelib_TypeDescriptionReference * pMacroTypeRef = (pTypeRef); \ + typelib_TypeDescription ** ppMacroTypeDescr = (ppDescription); \ + if (TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK( pMacroTypeRef->eTypeClass )) \ { \ - typelib_typedescriptionreference_getDescription( __ppMacroTypeDescr, __pMacroTypeRef ); \ + typelib_typedescriptionreference_getDescription( ppMacroTypeDescr, pMacroTypeRef ); \ } \ - else if (!__pMacroTypeRef->pType || !__pMacroTypeRef->pType->pWeakRef) \ + else if (!pMacroTypeRef->pType || !pMacroTypeRef->pType->pWeakRef) \ { \ - typelib_typedescriptionreference_getDescription( __ppMacroTypeDescr, __pMacroTypeRef ); \ - if (*__ppMacroTypeDescr) \ - typelib_typedescription_release( *__ppMacroTypeDescr ); \ + typelib_typedescriptionreference_getDescription( ppMacroTypeDescr, pMacroTypeRef ); \ + if (*ppMacroTypeDescr) \ + typelib_typedescription_release( *ppMacroTypeDescr ); \ } \ else \ { \ - *__ppMacroTypeDescr = __pMacroTypeRef->pType; \ + *ppMacroTypeDescr = pMacroTypeRef->pType; \ } \ } diff --git a/cppu/inc/uno/lbnames.h b/cppu/inc/uno/lbnames.h index 524d760d96a7..ea0a9245bb2b 100644 --- a/cppu/inc/uno/lbnames.h +++ b/cppu/inc/uno/lbnames.h @@ -2,9 +2,9 @@ * * $RCSfile: lbnames.h,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: dbo $ $Date: 2001-11-09 09:14:30 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,9 +69,9 @@ #error "ms visual c++ version must be at least 4.2" #elif (_MSC_VER < 1100) // MSVC 4.x #pragma warning( disable: 4290 ) -#define __CPPU_ENV msci +#define TMP_CPPU_ENV msci #elif (_MSC_VER < 1400) // MSVC 5-7 -#define __CPPU_ENV msci +#define TMP_CPPU_ENV msci #else #error "ms visual c++ version must be between 4.2 and 7.x" #endif /* (_MSC_VER < 1000) */ @@ -81,7 +81,7 @@ #error "sunpro cc must be at least 5.x" provoking error here, because PP ignores #error #elif (__SUNPRO_CC < 0x600) -#define __CPPU_ENV sunpro5 +#define TMP_CPPU_ENV sunpro5 #else #error "sunpro cc version must be 5.x" provoking error here, because PP ignores #error @@ -89,13 +89,13 @@ provoking error here, because PP ignores #error /* g++ 2.x, 3.0 */ #elif defined (__GNUC__) #if (__GNUC__ == 2 && __GNUC_MINOR__ == 91) -#define __CPPU_ENV gcc2 +#define TMP_CPPU_ENV gcc2 #elif (__GNUC__ == 2 && __GNUC_MINOR__ == 95) -#define __CPPU_ENV gcc2 +#define TMP_CPPU_ENV gcc2 #elif (__GNUC__ == 2) #error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version." #elif (__GNUC__ == 3 && __GNUC_MINOR__ == 0) -#define __CPPU_ENV gcc3 +#define TMP_CPPU_ENV gcc3 #elif (__GNUC__ == 3) #error "Tested gcc 3 version is 3.0. Patch uno/lbnames.h to try your gcc 3 version." #else @@ -103,13 +103,13 @@ provoking error here, because PP ignores #error #endif /* defined (__GNUC__) */ #endif /* defined (_MSC_VER) */ -#if (! defined (CPPU_ENV) && defined (__CPPU_ENV)) -#define CPPU_ENV __CPPU_ENV +#if (! defined (CPPU_ENV) && defined (TMP_CPPU_ENV)) +#define CPPU_ENV TMP_CPPU_ENV #endif #ifdef CPPU_ENV /* test: whether given CPPU_ENV matches expected one */ -#if (CPPU_ENV != __CPPU_ENV) +#if (CPPU_ENV != TMP_CPPU_ENV) #error "CPPU_ENV: unexpected env!" provoking error here, because PP ignores #error #endif diff --git a/cppu/source/cppu/cppu_opt.cxx b/cppu/source/cppu/cppu_opt.cxx index 18af1d7893b1..023616432df2 100644 --- a/cppu/source/cppu/cppu_opt.cxx +++ b/cppu/source/cppu/cppu_opt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cppu_opt.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dbo $ $Date: 2002-08-19 07:18:47 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,7 +66,7 @@ using namespace ::rtl; //################################################################################################## -extern "C" rtl_uString * SAL_CALL __cppu_unsatisfied_query_msg( +extern "C" rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg( typelib_TypeDescriptionReference * pType ) SAL_THROW_EXTERN_C() { diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index 6af7487a2e37..f212165eaf73 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -2,9 +2,9 @@ * * $RCSfile: static_types.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: dbo $ $Date: 2001-04-12 13:39:23 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -160,7 +160,7 @@ static Mutex & typelib_getStaticInitMutex() SAL_THROW( () ) } // !for NOT REALLY WEAK TYPES only! -static inline typelib_TypeDescriptionReference * __getTypeByName( rtl_uString * pTypeName ) +static inline typelib_TypeDescriptionReference * igetTypeByName( rtl_uString * pTypeName ) SAL_THROW( () ) { typelib_TypeDescriptionReference * pRef = 0; @@ -393,7 +393,7 @@ void SAL_CALL typelib_static_sequence_type_init( OUString aTypeName( aBuf.makeStringAndClear() ); OSL_ASSERT( ! TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK(typelib_TypeClass_SEQUENCE) ); - if (! (*ppRef = __getTypeByName( aTypeName.pData ))) + if (! (*ppRef = igetTypeByName( aTypeName.pData ))) { typelib_TypeDescription * pReg = 0; ::typelib_typedescription_new( @@ -430,7 +430,7 @@ void SAL_CALL typelib_static_compound_type_init( { OSL_ASSERT( ! TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK(eTypeClass) ); OUString aTypeName( OUString::createFromAscii( pTypeName ) ); - if (! (*ppRef = __getTypeByName( aTypeName.pData ))) + if (! (*ppRef = igetTypeByName( aTypeName.pData ))) { typelib_CompoundTypeDescription * pComp = 0; ::typelib_typedescription_newEmpty( @@ -498,7 +498,7 @@ void SAL_CALL typelib_static_interface_type_init( { OSL_ASSERT( ! TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK(typelib_TypeClass_INTERFACE) ); OUString aTypeName( OUString::createFromAscii( pTypeName ) ); - if (! (*ppRef = __getTypeByName( aTypeName.pData ))) + if (! (*ppRef = igetTypeByName( aTypeName.pData ))) { typelib_InterfaceTypeDescription * pIface = 0; ::typelib_typedescription_newEmpty( @@ -551,7 +551,7 @@ void SAL_CALL typelib_static_enum_type_init( { OSL_ASSERT( ! TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK(typelib_TypeClass_ENUM) ); OUString aTypeName( OUString::createFromAscii( pTypeName ) ); - if (! (*ppRef = __getTypeByName( aTypeName.pData ))) + if (! (*ppRef = igetTypeByName( aTypeName.pData ))) { typelib_TypeDescription * pReg = 0; ::typelib_typedescription_newEmpty( @@ -611,7 +611,7 @@ void SAL_CALL typelib_static_array_type_init( OUString aTypeName( aBuf.makeStringAndClear() ); OSL_ASSERT( ! TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK(typelib_TypeClass_ARRAY) ); - if (! (*ppRef = __getTypeByName( aTypeName.pData ))) + if (! (*ppRef = igetTypeByName( aTypeName.pData ))) { typelib_TypeDescription * pReg = 0; ::typelib_typedescription_newEmpty( @@ -663,7 +663,7 @@ void SAL_CALL typelib_static_union_type_init( { OSL_ASSERT( ! TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK(typelib_TypeClass_UNION) ); OUString aTypeName( OUString::createFromAscii( pTypeName ) ); - if (! (*ppRef = __getTypeByName( aTypeName.pData ))) + if (! (*ppRef = igetTypeByName( aTypeName.pData ))) { typelib_UnionTypeDescription * pUnion = 0; ::typelib_typedescription_newEmpty( diff --git a/cppu/source/uno/any.cxx b/cppu/source/uno/any.cxx index 31ebb33509b6..6f14ce7dc8af 100644 --- a/cppu/source/uno/any.cxx +++ b/cppu/source/uno/any.cxx @@ -2,9 +2,9 @@ * * $RCSfile: any.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dbo $ $Date: 2001-09-06 10:25:51 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,14 +74,14 @@ void SAL_CALL uno_type_any_assign( uno_AcquireFunc acquire, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - __destructAny( pDest, release ); + _destructAny( pDest, release ); if (pType) { - __copyConstructAny( pDest, pSource, pType, 0, acquire, 0 ); + _copyConstructAny( pDest, pSource, pType, 0, acquire, 0 ); } else { - __CONSTRUCT_EMPTY_ANY( pDest ); + CONSTRUCT_EMPTY_ANY( pDest ); } } //################################################################################################## @@ -91,14 +91,14 @@ void SAL_CALL uno_any_assign( uno_AcquireFunc acquire, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - __destructAny( pDest, release ); + _destructAny( pDest, release ); if (pTypeDescr) { - __copyConstructAny( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, acquire, 0 ); + _copyConstructAny( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, acquire, 0 ); } else { - __CONSTRUCT_EMPTY_ANY( pDest ); + CONSTRUCT_EMPTY_ANY( pDest ); } } //################################################################################################## @@ -110,11 +110,11 @@ void SAL_CALL uno_type_any_construct( { if (pType) { - __copyConstructAny( pDest, pSource, pType, 0, acquire, 0 ); + _copyConstructAny( pDest, pSource, pType, 0, acquire, 0 ); } else { - __CONSTRUCT_EMPTY_ANY( pDest ); + CONSTRUCT_EMPTY_ANY( pDest ); } } //################################################################################################## @@ -126,11 +126,11 @@ void SAL_CALL uno_any_construct( { if (pTypeDescr) { - __copyConstructAny( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, acquire, 0 ); + _copyConstructAny( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, acquire, 0 ); } else { - __CONSTRUCT_EMPTY_ANY( pDest ); + CONSTRUCT_EMPTY_ANY( pDest ); } } //################################################################################################## @@ -142,11 +142,11 @@ void SAL_CALL uno_type_any_constructAndConvert( { if (pType) { - __copyConstructAny( pDest, pSource, pType, 0, 0, mapping ); + _copyConstructAny( pDest, pSource, pType, 0, 0, mapping ); } else { - __CONSTRUCT_EMPTY_ANY( pDest ); + CONSTRUCT_EMPTY_ANY( pDest ); } } //################################################################################################## @@ -158,24 +158,24 @@ void SAL_CALL uno_any_constructAndConvert( { if (pTypeDescr) { - __copyConstructAny( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, 0, mapping ); + _copyConstructAny( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, 0, mapping ); } else { - __CONSTRUCT_EMPTY_ANY( pDest ); + CONSTRUCT_EMPTY_ANY( pDest ); } } //################################################################################################## void SAL_CALL uno_any_destruct( uno_Any * pValue, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - __destructAny( pValue, release ); + _destructAny( pValue, release ); } //################################################################################################## void SAL_CALL uno_any_clear( uno_Any * pValue, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - __destructAny( pValue, release ); - __CONSTRUCT_EMPTY_ANY( pValue ); + _destructAny( pValue, release ); + CONSTRUCT_EMPTY_ANY( pValue ); } } diff --git a/cppu/source/uno/assign.hxx b/cppu/source/uno/assign.hxx index fc4296449946..7af9ac5edfb0 100644 --- a/cppu/source/uno/assign.hxx +++ b/cppu/source/uno/assign.hxx @@ -2,9 +2,9 @@ * * $RCSfile: assign.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: dbo $ $Date: 2001-06-29 11:06:54 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,25 +58,25 @@ * * ************************************************************************/ -#ifndef __ASSIGN_HXX__ -#define __ASSIGN_HXX__ +#ifndef ASSIGN_HXX +#define ASSIGN_HXX #include "prim.hxx" #include "destr.hxx" #include "constr.hxx" #include "copy.hxx" + namespace cppu { - //################################################################################################## //#### assignment ################################################################################## //################################################################################################## //-------------------------------------------------------------------------------------------------- -inline void __assignInterface( +inline void _assignInterface( void ** ppDest, void * pSource, uno_AcquireFunc acquire, uno_ReleaseFunc release ) SAL_THROW( () ) @@ -99,7 +99,7 @@ inline void __assignInterface( *ppDest = pSource; } //-------------------------------------------------------------------------------------------------- -inline sal_Bool __queryAndAssignInterface( +inline sal_Bool _queryAndAssignInterface( void ** ppDest, void * pSource, typelib_TypeDescriptionReference * pDestType, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) @@ -120,14 +120,14 @@ inline sal_Bool __queryAndAssignInterface( void * aArgs[1]; aArgs[0] = &pDestType; - typelib_TypeDescription * pMTqueryInterface = __getQueryInterfaceTypeDescr(); + typelib_TypeDescription * pMTqueryInterface = _getQueryInterfaceTypeDescr(); (*((uno_Interface *)pSource)->pDispatcher)( (uno_Interface *)pSource, pMTqueryInterface, &aRet, aArgs, &pExc ); OSL_ENSURE( !pExc, "### Exception occured during queryInterface()!" ); if (pExc) { - __destructAny( pExc, 0 ); + _destructAny( pExc, 0 ); pSource = 0; } else @@ -164,7 +164,7 @@ sal_Bool assignStruct( uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) SAL_THROW( () ); //-------------------------------------------------------------------------------------------------- -inline sal_Bool __assignStruct( +inline sal_Bool _assignStruct( void * pDest, void * pSource, typelib_CompoundTypeDescription * pTypeDescr, uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) @@ -197,7 +197,7 @@ inline sal_Bool __assignStruct( return sal_True; } //-------------------------------------------------------------------------------------------------- -inline sal_Bool __assignArray( +inline sal_Bool _assignArray( void * pDest, void * pSource, typelib_ArrayTypeDescription * pTypeDescr, uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) @@ -243,7 +243,7 @@ inline sal_Bool __assignArray( for (i=0; i < nTotalElements; i++) { ::typelib_typedescriptionreference_release( *((typelib_TypeDescriptionReference **)pDest + i) ); - __TYPE_ACQUIRE( + TYPE_ACQUIRE( *((typelib_TypeDescriptionReference **)pDest + i) = *((typelib_TypeDescriptionReference **)pSource + i) ); } @@ -252,9 +252,9 @@ inline sal_Bool __assignArray( case typelib_TypeClass_ANY: for (i=0; i < nTotalElements; i++) { - __destructAny( (uno_Any *)pDest + i, release ); - __copyConstructAny( (uno_Any *)pDest + i, (uno_Any *)pSource + i, - pElementTypeRef, pElementTypeDescr, acquire, 0 ); + _destructAny( (uno_Any *)pDest + i, release ); + _copyConstructAny( (uno_Any *)pDest + i, (uno_Any *)pSource + i, + pElementTypeRef, pElementTypeDescr, acquire, 0 ); } bRet = sal_True; break; @@ -274,11 +274,11 @@ inline sal_Bool __assignArray( case typelib_TypeClass_EXCEPTION: for (i=0; i < nTotalElements; i++) { - bRet = __assignStruct( (sal_Char *)pDest + i * nElementSize, - (sal_Char *)pSource + i * nElementSize, - (typelib_CompoundTypeDescription *)pElementTypeDescr, - queryInterface, acquire, release ); - if ( !bRet ) + bRet = _assignStruct( (sal_Char *)pDest + i * nElementSize, + (sal_Char *)pSource + i * nElementSize, + (typelib_CompoundTypeDescription *)pElementTypeDescr, + queryInterface, acquire, release ); + if (! bRet) break; } bRet = sal_True; @@ -286,17 +286,18 @@ inline sal_Bool __assignArray( case typelib_TypeClass_UNION: for (i=0; i < nTotalElements; i++) { - __destructUnion( (sal_Char*)pDest + i * nElementSize, pElementTypeDescr, release ); - __copyConstructUnion( (sal_Char*)pDest + i * nElementSize, - (sal_Char*)pSource + i * nElementSize, - pElementTypeDescr, acquire, 0 ); + _destructUnion( (sal_Char*)pDest + i * nElementSize, pElementTypeDescr, release ); + _copyConstructUnion( (sal_Char*)pDest + i * nElementSize, + (sal_Char*)pSource + i * nElementSize, + pElementTypeDescr, acquire, 0 ); } bRet = sal_True; break; case typelib_TypeClass_SEQUENCE: for (i=0; i < nTotalElements; i++) { - __destructSequence( *((uno_Sequence **)pDest + i), pElementTypeRef, pElementTypeDescr, release ); + _destructSequence( + *((uno_Sequence **)pDest + i), pElementTypeRef, pElementTypeDescr, release ); ::osl_incrementInterlockedCount( &(*((uno_Sequence **)pSource + i))->nRefCount ); *((uno_Sequence **)pDest + i) = *((uno_Sequence **)pSource + i); } @@ -305,9 +306,9 @@ inline sal_Bool __assignArray( case typelib_TypeClass_INTERFACE: for (i=0; i < nTotalElements; i++) { - __assignInterface( (void **)((sal_Char*)pDest + i * nElementSize), - *(void **)((sal_Char*)pSource + i * nElementSize), - acquire, release ); + _assignInterface( (void **)((sal_Char*)pDest + i * nElementSize), + *(void **)((sal_Char*)pSource + i * nElementSize), + acquire, release ); } bRet = sal_True; break; @@ -317,7 +318,7 @@ inline sal_Bool __assignArray( return bRet; } //-------------------------------------------------------------------------------------------------- -inline sal_Bool __assignData( +inline sal_Bool _assignData( void * pDest, typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr, void * pSource, @@ -330,8 +331,8 @@ inline sal_Bool __assignData( if (! pSource) { - __destructData( pDest, pDestType, pDestTypeDescr, release ); - __defaultConstructData( pDest, pDestType, pDestTypeDescr ); + _destructData( pDest, pDestType, pDestTypeDescr, release ); + _defaultConstructData( pDest, pDestType, pDestTypeDescr ); return sal_True; } while (typelib_TypeClass_ANY == pSourceType->eTypeClass) @@ -540,17 +541,17 @@ inline sal_Bool __assignData( { case typelib_TypeClass_TYPE: ::typelib_typedescriptionreference_release( *(typelib_TypeDescriptionReference **)pDest ); - __TYPE_ACQUIRE( + TYPE_ACQUIRE( *(typelib_TypeDescriptionReference **)pDest = *(typelib_TypeDescriptionReference **)pSource ); return sal_True; } return sal_False; case typelib_TypeClass_ANY: - __destructAny( (uno_Any *)pDest, release ); - __copyConstructAny( (uno_Any *)pDest, pSource, pSourceType, pSourceTypeDescr, acquire, 0 ); + _destructAny( (uno_Any *)pDest, release ); + _copyConstructAny( (uno_Any *)pDest, pSource, pSourceType, pSourceTypeDescr, acquire, 0 ); return sal_True; case typelib_TypeClass_ENUM: - if (__type_equals( pDestType, pSourceType )) + if (_type_equals( pDestType, pSourceType )) { *(sal_Int32 *)pDest = *(sal_Int32 *)pSource; return sal_True; @@ -571,20 +572,32 @@ inline sal_Bool __assignData( { typelib_CompoundTypeDescription * pTypeDescr = (typelib_CompoundTypeDescription *)pSourceTypeDescr; - while (pTypeDescr && !__type_equals( ((typelib_TypeDescription *)pTypeDescr)->pWeakRef, pDestType )) + while (pTypeDescr && + !_type_equals( ((typelib_TypeDescription *)pTypeDescr)->pWeakRef, pDestType )) + { pTypeDescr = pTypeDescr->pBaseTypeDescription; + } if (pTypeDescr) - bRet = __assignStruct( pDest, pSource, pTypeDescr, queryInterface, acquire, release ); + { + bRet = _assignStruct( + pDest, pSource, pTypeDescr, queryInterface, acquire, release ); + } } else { TYPELIB_DANGER_GET( &pSourceTypeDescr, pSourceType ); typelib_CompoundTypeDescription * pTypeDescr = (typelib_CompoundTypeDescription *)pSourceTypeDescr; - while (pTypeDescr && !__type_equals( ((typelib_TypeDescription *)pTypeDescr)->pWeakRef, pDestType )) + while (pTypeDescr && + !_type_equals( ((typelib_TypeDescription *)pTypeDescr)->pWeakRef, pDestType )) + { pTypeDescr = pTypeDescr->pBaseTypeDescription; + } if (pTypeDescr) - bRet = __assignStruct( pDest, pSource, pTypeDescr, queryInterface, acquire, release ); + { + bRet = _assignStruct( + pDest, pSource, pTypeDescr, queryInterface, acquire, release ); + } TYPELIB_DANGER_RELEASE( pSourceTypeDescr ); } return bRet; @@ -597,7 +610,7 @@ inline sal_Bool __assignData( { typelib_ArrayTypeDescription * pTypeDescr = (typelib_ArrayTypeDescription *)pSourceTypeDescr; - bRet = __assignArray( pDest, pSource, pTypeDescr, queryInterface, acquire, release ); + bRet = _assignArray( pDest, pSource, pTypeDescr, queryInterface, acquire, release ); } else { @@ -605,25 +618,28 @@ inline sal_Bool __assignData( typelib_ArrayTypeDescription * pTypeDescr = (typelib_ArrayTypeDescription *)pSourceTypeDescr; if ( pTypeDescr ) - bRet = __assignArray( pDest, pSource, pTypeDescr, queryInterface, acquire, release ); + { + bRet = _assignArray( + pDest, pSource, pTypeDescr, queryInterface, acquire, release ); + } TYPELIB_DANGER_RELEASE( pSourceTypeDescr ); } return bRet; } return sal_False; case typelib_TypeClass_UNION: - if (__type_equals( pDestType, pSourceType )) + if (_type_equals( pDestType, pSourceType )) { if (pDestTypeDescr) { - __destructUnion( pDest, pDestTypeDescr, release ); - __copyConstructUnion( pDest, pSource, pDestTypeDescr, acquire, 0 ); + _destructUnion( pDest, pDestTypeDescr, release ); + _copyConstructUnion( pDest, pSource, pDestTypeDescr, acquire, 0 ); } else { TYPELIB_DANGER_GET( &pDestTypeDescr, pDestType ); - __destructUnion( pDest, pDestTypeDescr, release ); - __copyConstructUnion( pDest, pSource, pDestTypeDescr, acquire, 0 ); + _destructUnion( pDest, pDestTypeDescr, release ); + _copyConstructUnion( pDest, pSource, pDestTypeDescr, acquire, 0 ); TYPELIB_DANGER_RELEASE( pDestTypeDescr ); } return sal_True; @@ -634,9 +650,9 @@ inline sal_Bool __assignData( return sal_False; if (*(uno_Sequence **)pSource == *(uno_Sequence **)pDest) // self assignment return sal_True; - if (__type_equals( pDestType, pSourceType )) + if (_type_equals( pDestType, pSourceType )) { - __destructSequence( *(uno_Sequence **)pDest, pDestType, pDestTypeDescr, release ); + _destructSequence( *(uno_Sequence **)pDest, pDestType, pDestTypeDescr, release ); ::osl_incrementInterlockedCount( &(*(uno_Sequence **)pSource)->nRefCount ); *(uno_Sequence **)pDest = *(uno_Sequence **)pSource; return sal_True; @@ -645,9 +661,9 @@ inline sal_Bool __assignData( case typelib_TypeClass_INTERFACE: if (typelib_TypeClass_INTERFACE != pSourceType->eTypeClass) return sal_False; - if (__type_equals( pDestType, pSourceType )) + if (_type_equals( pDestType, pSourceType )) { - __assignInterface( (void **)pDest, *(void **)pSource, acquire, release ); + _assignInterface( (void **)pDest, *(void **)pSource, acquire, release ); return sal_True; } else @@ -656,31 +672,31 @@ inline sal_Bool __assignData( if (pSourceTypeDescr) { typelib_TypeDescription * pTD = pSourceTypeDescr; - while (pTD && !__type_equals( pTD->pWeakRef, pDestType )) + while (pTD && !_type_equals( pTD->pWeakRef, pDestType )) pTD = (typelib_TypeDescription *)((typelib_InterfaceTypeDescription *)pTD)->pBaseTypeDescription; if (pTD) // is base of dest { - __assignInterface( (void **)pDest, *(void **)pSource, acquire, release ); + _assignInterface( (void **)pDest, *(void **)pSource, acquire, release ); bRet = sal_True; } else { // query for interface - bRet = __queryAndAssignInterface( + bRet = _queryAndAssignInterface( (void **)pDest, *(void **)pSource, pDestType, queryInterface, release ); } } else { - if (__type_equals( pSourceType, pDestType )) + if (_type_equals( pSourceType, pDestType )) { - __assignInterface( (void **)pDest, *(void **)pSource, acquire, release ); + _assignInterface( (void **)pDest, *(void **)pSource, acquire, release ); bRet = sal_True; } else { // query for interface - bRet = __queryAndAssignInterface( + bRet = _queryAndAssignInterface( (void **)pDest, *(void **)pSource, pDestType, queryInterface, release ); } } diff --git a/cppu/source/uno/constr.hxx b/cppu/source/uno/constr.hxx index 25e539ab1ce9..414200f39fd1 100644 --- a/cppu/source/uno/constr.hxx +++ b/cppu/source/uno/constr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: constr.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: dbo $ $Date: 2001-06-29 11:06:54 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,11 +58,12 @@ * * ************************************************************************/ -#ifndef __CONSTR_HXX__ -#define __CONSTR_HXX__ +#ifndef CONSTR_HXX +#define CONSTR_HXX #include "prim.hxx" + namespace cppu { @@ -71,7 +72,7 @@ namespace cppu //################################################################################################## //-------------------------------------------------------------------------------------------------- -inline void __defaultConstructUnion( +inline void _defaultConstructUnion( void * pMem, typelib_TypeDescription * pTypeDescr ) SAL_THROW( () ) @@ -87,7 +88,7 @@ void defaultConstructStruct( typelib_CompoundTypeDescription * pCompType ) SAL_THROW( () ); //-------------------------------------------------------------------------------------------------- -inline void __defaultConstructStruct( +inline void _defaultConstructStruct( void * pMem, typelib_CompoundTypeDescription * pTypeDescr ) SAL_THROW( () ) @@ -108,7 +109,7 @@ inline void __defaultConstructStruct( } //-------------------------------------------------------------------------------------------------- -inline void __defaultConstructArray( +inline void _defaultConstructArray( void * pMem, typelib_ArrayTypeDescription * pTypeDescr ) { @@ -146,13 +147,13 @@ inline void __defaultConstructArray( for (i=0; i < nTotalElements; i++) { typelib_TypeDescriptionReference** ppElement = (typelib_TypeDescriptionReference **)pMem + i; - *ppElement = __getVoidType(); + *ppElement = _getVoidType(); } break; case typelib_TypeClass_ANY: for (i=0; i < nTotalElements; i++) { - __CONSTRUCT_EMPTY_ANY( (uno_Any *)pMem + i ); + CONSTRUCT_EMPTY_ANY( (uno_Any *)pMem + i ); } break; case typelib_TypeClass_ENUM: @@ -170,20 +171,20 @@ inline void __defaultConstructArray( case typelib_TypeClass_EXCEPTION: for (i=0; i < nTotalElements; i++) { - __defaultConstructStruct( (sal_Char*)pMem + i * nElementSize, (typelib_CompoundTypeDescription *)pElementType ); + _defaultConstructStruct( (sal_Char*)pMem + i * nElementSize, (typelib_CompoundTypeDescription *)pElementType ); } break; case typelib_TypeClass_UNION: for (i=0; i < nTotalElements; i++) { - __defaultConstructUnion( (sal_Char*)pMem + i * nElementSize, pElementType ); + _defaultConstructUnion( (sal_Char*)pMem + i * nElementSize, pElementType ); } break; case typelib_TypeClass_SEQUENCE: for (i=0; i < nTotalElements; i++) { uno_Sequence** ppElement = (uno_Sequence **)pMem + i; - *ppElement = __getEmptySequence(); + *ppElement = _getEmptySequence(); } break; } @@ -191,7 +192,7 @@ inline void __defaultConstructArray( } //-------------------------------------------------------------------------------------------------- -inline void __defaultConstructData( +inline void _defaultConstructData( void * pMem, typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr ) @@ -231,10 +232,10 @@ inline void __defaultConstructData( ::rtl_uString_new( (rtl_uString **)pMem ); break; case typelib_TypeClass_TYPE: - *(typelib_TypeDescriptionReference **)pMem = __getVoidType(); + *(typelib_TypeDescriptionReference **)pMem = _getVoidType(); break; case typelib_TypeClass_ANY: - __CONSTRUCT_EMPTY_ANY( (uno_Any *)pMem ); + CONSTRUCT_EMPTY_ANY( (uno_Any *)pMem ); break; case typelib_TypeClass_ENUM: if (pTypeDescr) @@ -257,41 +258,41 @@ inline void __defaultConstructData( case typelib_TypeClass_EXCEPTION: if (pTypeDescr) { - __defaultConstructStruct( pMem, (typelib_CompoundTypeDescription *)pTypeDescr ); + _defaultConstructStruct( pMem, (typelib_CompoundTypeDescription *)pTypeDescr ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __defaultConstructStruct( pMem, (typelib_CompoundTypeDescription *)pTypeDescr ); + _defaultConstructStruct( pMem, (typelib_CompoundTypeDescription *)pTypeDescr ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; case typelib_TypeClass_ARRAY: if (pTypeDescr) { - __defaultConstructArray( pMem, (typelib_ArrayTypeDescription *)pTypeDescr ); + _defaultConstructArray( pMem, (typelib_ArrayTypeDescription *)pTypeDescr ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __defaultConstructArray( pMem, (typelib_ArrayTypeDescription *)pTypeDescr ); + _defaultConstructArray( pMem, (typelib_ArrayTypeDescription *)pTypeDescr ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; case typelib_TypeClass_UNION: if (pTypeDescr) { - __defaultConstructUnion( pMem, pTypeDescr ); + _defaultConstructUnion( pMem, pTypeDescr ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __defaultConstructUnion( pMem, pTypeDescr ); + _defaultConstructUnion( pMem, pTypeDescr ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; case typelib_TypeClass_SEQUENCE: - *(uno_Sequence **)pMem = __getEmptySequence(); + *(uno_Sequence **)pMem = _getEmptySequence(); break; case typelib_TypeClass_INTERFACE: *(void **)pMem = 0; // either cpp or c-uno interface diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx index 0aeb21fca314..adcfb9241b9e 100644 --- a/cppu/source/uno/copy.hxx +++ b/cppu/source/uno/copy.hxx @@ -2,9 +2,9 @@ * * $RCSfile: copy.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: dbo $ $Date: 2001-06-29 11:06:54 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,21 +58,20 @@ * * ************************************************************************/ -#ifndef __COPY_HXX__ -#define __COPY_HXX__ +#ifndef COPY_HXX +#define COPY_HXX #include "prim.hxx" #include "constr.hxx" + namespace cppu { - //################################################################################################## //#### copy construction ########################################################################### //################################################################################################## - //-------------------------------------------------------------------------------------------------- void copyConstructStruct( void * pDest, void * pSource, @@ -80,7 +79,7 @@ void copyConstructStruct( uno_AcquireFunc acquire, uno_Mapping * mapping ) SAL_THROW ( () ); //-------------------------------------------------------------------------------------------------- -inline void __copyConstructStruct( +inline void _copyConstructStruct( void * pDest, void * pSource, typelib_CompoundTypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_Mapping * mapping ) @@ -119,7 +118,7 @@ inline void __copyConstructStruct( } } //-------------------------------------------------------------------------------------------------- -inline void __copyConstructArray( +inline void _copyConstructArray( void * pDest, void * pSource, typelib_ArrayTypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_Mapping * mapping ) @@ -153,13 +152,13 @@ inline void __copyConstructArray( } } //-------------------------------------------------------------------------------------------------- -inline void __copyConstructUnion( +inline void _copyConstructUnion( void * pDest, void * pSource, typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_Mapping * mapping ) SAL_THROW ( () ) { - typelib_TypeDescriptionReference * pSetType = __unionGetSetType( pSource, pTypeDescr ); + typelib_TypeDescriptionReference * pSetType = _unionGetSetType( pSource, pTypeDescr ); if (mapping) { ::uno_type_copyAndConvertData( @@ -184,13 +183,13 @@ void copyConstructSequence( uno_AcquireFunc acquire, uno_Mapping * mapping ) SAL_THROW ( () ); //-------------------------------------------------------------------------------------------------- -inline void __copyConstructAnyFromData( +inline void _copyConstructAnyFromData( uno_Any * pDestAny, void * pSource, typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_Mapping * mapping ) SAL_THROW ( () ) { - __TYPE_ACQUIRE( pType ); + TYPE_ACQUIRE( pType ); pDestAny->pType = pType; switch (pType->eTypeClass) @@ -260,7 +259,7 @@ inline void __copyConstructAnyFromData( *(rtl_uString **)&pDestAny->pReserved = *(rtl_uString **)pSource; break; case typelib_TypeClass_TYPE: - __TYPE_ACQUIRE( *(typelib_TypeDescriptionReference **)pSource ); + TYPE_ACQUIRE( *(typelib_TypeDescriptionReference **)pSource ); pDestAny->pData = &pDestAny->pReserved; *(typelib_TypeDescriptionReference **)&pDestAny->pReserved = *(typelib_TypeDescriptionReference **)pSource; break; @@ -284,7 +283,7 @@ inline void __copyConstructAnyFromData( if (pTypeDescr) { pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); - __copyConstructStruct( + _copyConstructStruct( pDestAny->pData, pSource, (typelib_CompoundTypeDescription *)pTypeDescr, acquire, mapping ); @@ -293,7 +292,7 @@ inline void __copyConstructAnyFromData( { TYPELIB_DANGER_GET( &pTypeDescr, pType ); pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); - __copyConstructStruct( + _copyConstructStruct( pDestAny->pData, pSource, (typelib_CompoundTypeDescription *)pTypeDescr, acquire, mapping ); @@ -304,7 +303,7 @@ inline void __copyConstructAnyFromData( if (pTypeDescr) { pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); - __copyConstructArray( + _copyConstructArray( pDestAny->pData, pSource, (typelib_ArrayTypeDescription *)pTypeDescr, acquire, mapping ); @@ -313,7 +312,7 @@ inline void __copyConstructAnyFromData( { TYPELIB_DANGER_GET( &pTypeDescr, pType ); pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); - __copyConstructArray( + _copyConstructArray( pDestAny->pData, pSource, (typelib_ArrayTypeDescription *)pTypeDescr, acquire, mapping ); @@ -324,13 +323,13 @@ inline void __copyConstructAnyFromData( if (pTypeDescr) { pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); - __copyConstructUnion( pDestAny->pData, pSource, pTypeDescr, acquire, mapping ); + _copyConstructUnion( pDestAny->pData, pSource, pTypeDescr, acquire, mapping ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); - __copyConstructUnion( pDestAny->pData, pSource, pTypeDescr, acquire, mapping ); + _copyConstructUnion( pDestAny->pData, pSource, pTypeDescr, acquire, mapping ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; @@ -357,17 +356,17 @@ inline void __copyConstructAnyFromData( pDestAny->pData = &pDestAny->pReserved; if (mapping) { - pDestAny->pReserved = __map( *(void **)pSource, pType, pTypeDescr, mapping ); + pDestAny->pReserved = _map( *(void **)pSource, pType, pTypeDescr, mapping ); } else { - __acquire( pDestAny->pReserved = *(void **)pSource, acquire ); + _acquire( pDestAny->pReserved = *(void **)pSource, acquire ); } break; } } //-------------------------------------------------------------------------------------------------- -inline void __copyConstructAny( +inline void _copyConstructAny( uno_Any * pDestAny, void * pSource, typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_Mapping * mapping ) @@ -375,7 +374,7 @@ inline void __copyConstructAny( { if (typelib_TypeClass_VOID == pType->eTypeClass) { - __CONSTRUCT_EMPTY_ANY( pDestAny ); + CONSTRUCT_EMPTY_ANY( pDestAny ); } else { @@ -386,7 +385,7 @@ inline void __copyConstructAny( pType = ((uno_Any *)pSource)->pType; if (typelib_TypeClass_VOID == pType->eTypeClass) { - __CONSTRUCT_EMPTY_ANY( pDestAny ); + CONSTRUCT_EMPTY_ANY( pDestAny ); return; } pTypeDescr = 0; @@ -394,17 +393,17 @@ inline void __copyConstructAny( } else { - __CONSTRUCT_EMPTY_ANY( pDestAny ); + CONSTRUCT_EMPTY_ANY( pDestAny ); return; } } if (pSource) { - __copyConstructAnyFromData( pDestAny, pSource, pType, pTypeDescr, acquire, mapping ); + _copyConstructAnyFromData( pDestAny, pSource, pType, pTypeDescr, acquire, mapping ); } else // default construct { - __TYPE_ACQUIRE( pType ); + TYPE_ACQUIRE( pType ); pDestAny->pType = pType; switch (pType->eTypeClass) { @@ -474,7 +473,7 @@ inline void __copyConstructAny( break; case typelib_TypeClass_TYPE: pDestAny->pData = &pDestAny->pReserved; - *(typelib_TypeDescriptionReference **)&pDestAny->pReserved = __getVoidType(); + *(typelib_TypeDescriptionReference **)&pDestAny->pReserved = _getVoidType(); break; case typelib_TypeClass_ENUM: pDestAny->pData = &pDestAny->pReserved; @@ -499,14 +498,14 @@ inline void __copyConstructAny( if (pTypeDescr) { pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); - __defaultConstructStruct( + _defaultConstructStruct( pDestAny->pData, (typelib_CompoundTypeDescription *)pTypeDescr ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); - __defaultConstructStruct( + _defaultConstructStruct( pDestAny->pData, (typelib_CompoundTypeDescription *)pTypeDescr ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } @@ -515,14 +514,14 @@ inline void __copyConstructAny( if (pTypeDescr) { pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); - __defaultConstructArray( + _defaultConstructArray( pDestAny->pData, (typelib_ArrayTypeDescription *)pTypeDescr ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); - __defaultConstructArray( + _defaultConstructArray( pDestAny->pData, (typelib_ArrayTypeDescription *)pTypeDescr ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } @@ -531,19 +530,19 @@ inline void __copyConstructAny( if (pTypeDescr) { pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); - __defaultConstructUnion( pDestAny->pData, pTypeDescr ); + _defaultConstructUnion( pDestAny->pData, pTypeDescr ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); pDestAny->pData = ::rtl_allocateMemory( pTypeDescr->nSize ); - __defaultConstructUnion( pDestAny->pData, pTypeDescr ); + _defaultConstructUnion( pDestAny->pData, pTypeDescr ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; case typelib_TypeClass_SEQUENCE: pDestAny->pData = &pDestAny->pReserved; - *(uno_Sequence **)&pDestAny->pReserved = __getEmptySequence(); + *(uno_Sequence **)&pDestAny->pReserved = _getEmptySequence(); break; case typelib_TypeClass_INTERFACE: pDestAny->pData = &pDestAny->pReserved; @@ -554,7 +553,7 @@ inline void __copyConstructAny( } } //-------------------------------------------------------------------------------------------------- -inline void __copyConstructSequence( +inline void _copyConstructSequence( uno_Sequence ** ppDest, uno_Sequence * pSource, typelib_TypeDescriptionReference * pElementType, uno_AcquireFunc acquire, uno_Mapping * mapping ) @@ -585,11 +584,11 @@ inline void __copyConstructSequence( typelib_TypeDescriptionReference * pType = pSourceElements[nPos].pType; if (typelib_TypeClass_VOID == pType->eTypeClass) { - __CONSTRUCT_EMPTY_ANY( &pDestElements[nPos] ); + CONSTRUCT_EMPTY_ANY( &pDestElements[nPos] ); } else { - __copyConstructAnyFromData( + _copyConstructAnyFromData( &pDestElements[nPos], pSourceElements[nPos].pData, pType, 0, acquire, mapping ); @@ -609,7 +608,7 @@ inline void __copyConstructSequence( char * pElements = pDest->elements; for ( sal_Int32 nPos = nElements; nPos--; ) { - __copyConstructStruct( + _copyConstructStruct( pElements + (nPos * nElementSize), pSourceElements + (nPos * nElementSize), (typelib_CompoundTypeDescription *)pElementTypeDescr, @@ -629,7 +628,7 @@ inline void __copyConstructSequence( char * pElements = pDest->elements; for ( sal_Int32 nPos = nElements; nPos--; ) { - __copyConstructArray( + _copyConstructArray( pElements + (nPos * nElementSize), pSourceElements + (nPos * nElementSize), (typelib_ArrayTypeDescription *)pElementTypeDescr, @@ -653,7 +652,7 @@ inline void __copyConstructSequence( char * pDest = pElements + (nPos * nElementSize); char * pSource = pSourceElements + (nPos * nElementSize); - typelib_TypeDescriptionReference * pSetType = __unionGetSetType( + typelib_TypeDescriptionReference * pSetType = _unionGetSetType( pSource, pElementTypeDescr ); ::uno_type_copyAndConvertData( pDest + nValueOffset, pSource + nValueOffset, @@ -711,7 +710,7 @@ inline void __copyConstructSequence( { for ( sal_Int32 nPos = nElements; nPos--; ) { - __acquire( ((void **)pElements)[nPos] = pSourceElements[nPos], acquire ); + _acquire( ((void **)pElements)[nPos] = pSourceElements[nPos], acquire ); } } break; @@ -732,7 +731,7 @@ inline void __copyConstructSequence( } //-------------------------------------------------------------------------------------------------- -inline void __copyConstructData( +inline void _copyConstructData( void * pDest, void * pSource, typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire, uno_Mapping * mapping ) @@ -777,11 +776,11 @@ inline void __copyConstructData( *(rtl_uString **)pDest = *(rtl_uString **)pSource; break; case typelib_TypeClass_TYPE: - __TYPE_ACQUIRE( *(typelib_TypeDescriptionReference **)pSource ); + TYPE_ACQUIRE( *(typelib_TypeDescriptionReference **)pSource ); *(typelib_TypeDescriptionReference **)pDest = *(typelib_TypeDescriptionReference **)pSource; break; case typelib_TypeClass_ANY: - __copyConstructAny( + _copyConstructAny( (uno_Any *)pDest, ((uno_Any *)pSource)->pData, ((uno_Any *)pSource)->pType, 0, acquire, mapping ); @@ -798,7 +797,7 @@ inline void __copyConstructData( case typelib_TypeClass_EXCEPTION: if (pTypeDescr) { - __copyConstructStruct( + _copyConstructStruct( pDest, pSource, (typelib_CompoundTypeDescription *)pTypeDescr, acquire, mapping ); @@ -806,7 +805,7 @@ inline void __copyConstructData( else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __copyConstructStruct( + _copyConstructStruct( pDest, pSource, (typelib_CompoundTypeDescription *)pTypeDescr, acquire, mapping ); @@ -816,7 +815,7 @@ inline void __copyConstructData( case typelib_TypeClass_ARRAY: if (pTypeDescr) { - __copyConstructArray( + _copyConstructArray( pDest, pSource, (typelib_ArrayTypeDescription *)pTypeDescr, acquire, mapping ); @@ -824,7 +823,7 @@ inline void __copyConstructData( else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __copyConstructArray( + _copyConstructArray( pDest, pSource, (typelib_ArrayTypeDescription *)pTypeDescr, acquire, mapping ); @@ -834,12 +833,12 @@ inline void __copyConstructData( case typelib_TypeClass_UNION: if (pTypeDescr) { - __copyConstructUnion( pDest, pSource, pTypeDescr, acquire, mapping ); + _copyConstructUnion( pDest, pSource, pTypeDescr, acquire, mapping ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __copyConstructUnion( pDest, pSource, pTypeDescr, acquire, mapping ); + _copyConstructUnion( pDest, pSource, pTypeDescr, acquire, mapping ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; @@ -848,7 +847,7 @@ inline void __copyConstructData( { if (pTypeDescr) { - __copyConstructSequence( + _copyConstructSequence( (uno_Sequence **)pDest, *(uno_Sequence **)pSource, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, acquire, mapping ); @@ -856,7 +855,7 @@ inline void __copyConstructData( else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __copyConstructSequence( + _copyConstructSequence( (uno_Sequence **)pDest, *(uno_Sequence **)pSource, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, acquire, mapping ); @@ -871,9 +870,9 @@ inline void __copyConstructData( break; case typelib_TypeClass_INTERFACE: if (mapping) - *(void **)pDest = __map( *(void **)pSource, pType, pTypeDescr, mapping ); + *(void **)pDest = _map( *(void **)pSource, pType, pTypeDescr, mapping ); else - __acquire( *(void **)pDest = *(void **)pSource, acquire ); + _acquire( *(void **)pDest = *(void **)pSource, acquire ); break; } } diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index 23691abde96e..32cf1c224aa1 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -2,9 +2,9 @@ * * $RCSfile: data.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: dbo $ $Date: 2002-08-19 07:18:48 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,7 +83,7 @@ void defaultConstructStruct( typelib_CompoundTypeDescription * pCompType ) SAL_THROW( () ) { - __defaultConstructStruct( pMem, pCompType ); + _defaultConstructStruct( pMem, pCompType ); } //================================================================================================== void copyConstructStruct( @@ -92,7 +92,7 @@ void copyConstructStruct( uno_AcquireFunc acquire, uno_Mapping * mapping ) SAL_THROW( () ) { - __copyConstructStruct( pDest, pSource, pTypeDescr, acquire, mapping ); + _copyConstructStruct( pDest, pSource, pTypeDescr, acquire, mapping ); } //================================================================================================== void destructStruct( @@ -101,7 +101,7 @@ void destructStruct( uno_ReleaseFunc release ) SAL_THROW( () ) { - __destructStruct( pValue, pTypeDescr, release ); + _destructStruct( pValue, pTypeDescr, release ); } //================================================================================================== sal_Bool equalStruct( @@ -110,7 +110,7 @@ sal_Bool equalStruct( uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) SAL_THROW( () ) { - return __equalStruct( pDest, pSource, pTypeDescr, queryInterface, release ); + return _equalStruct( pDest, pSource, pTypeDescr, queryInterface, release ); } //================================================================================================== sal_Bool assignStruct( @@ -119,7 +119,7 @@ sal_Bool assignStruct( uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) SAL_THROW( () ) { - return __assignStruct( pDest, pSource, pTypeDescr, queryInterface, acquire, release ); + return _assignStruct( pDest, pSource, pTypeDescr, queryInterface, acquire, release ); } //================================================================================================== void copyConstructSequence( @@ -128,7 +128,7 @@ void copyConstructSequence( uno_AcquireFunc acquire, uno_Mapping * mapping ) SAL_THROW( () ) { - __copyConstructSequence( ppDest, pSource, pElementType, acquire, mapping ); + _copyConstructSequence( ppDest, pSource, pElementType, acquire, mapping ); } //================================================================================================== void destructSequence( @@ -143,7 +143,7 @@ void destructSequence( { if (pSequence->nElements) { - __destructElements( + _destructElements( pSequence->elements, pElementType, 0, pSequence->nElements, release ); } @@ -157,7 +157,7 @@ sal_Bool equalSequence( uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) SAL_THROW( () ) { - return __equalSequence( pDest, pSource, pElementType, queryInterface, release ); + return _equalSequence( pDest, pSource, pElementType, queryInterface, release ); } extern "C" @@ -167,14 +167,14 @@ void SAL_CALL uno_type_constructData( void * pMem, typelib_TypeDescriptionReference * pType ) SAL_THROW_EXTERN_C() { - __defaultConstructData( pMem, pType, 0 ); + _defaultConstructData( pMem, pType, 0 ); } //################################################################################################## void SAL_CALL uno_constructData( void * pMem, typelib_TypeDescription * pTypeDescr ) SAL_THROW_EXTERN_C() { - __defaultConstructData( pMem, pTypeDescr->pWeakRef, pTypeDescr ); + _defaultConstructData( pMem, pTypeDescr->pWeakRef, pTypeDescr ); } //################################################################################################## void SAL_CALL uno_type_destructData( @@ -182,7 +182,7 @@ void SAL_CALL uno_type_destructData( uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - __destructData( pValue, pType, 0, release ); + _destructData( pValue, pType, 0, release ); } //################################################################################################## void SAL_CALL uno_destructData( @@ -191,7 +191,7 @@ void SAL_CALL uno_destructData( uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - __destructData( pValue, pTypeDescr->pWeakRef, pTypeDescr, release ); + _destructData( pValue, pTypeDescr->pWeakRef, pTypeDescr, release ); } //################################################################################################## void SAL_CALL uno_type_copyData( @@ -200,7 +200,7 @@ void SAL_CALL uno_type_copyData( uno_AcquireFunc acquire ) SAL_THROW_EXTERN_C() { - __copyConstructData( pDest, pSource, pType, 0, acquire, 0 ); + _copyConstructData( pDest, pSource, pType, 0, acquire, 0 ); } //################################################################################################## void SAL_CALL uno_copyData( @@ -209,7 +209,7 @@ void SAL_CALL uno_copyData( uno_AcquireFunc acquire ) SAL_THROW_EXTERN_C() { - __copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, acquire, 0 ); + _copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, acquire, 0 ); } //################################################################################################## void SAL_CALL uno_type_copyAndConvertData( @@ -218,7 +218,7 @@ void SAL_CALL uno_type_copyAndConvertData( uno_Mapping * mapping ) SAL_THROW_EXTERN_C() { - __copyConstructData( pDest, pSource, pType, 0, 0, mapping ); + _copyConstructData( pDest, pSource, pType, 0, 0, mapping ); } //################################################################################################## void SAL_CALL uno_copyAndConvertData( @@ -227,7 +227,7 @@ void SAL_CALL uno_copyAndConvertData( uno_Mapping * mapping ) SAL_THROW_EXTERN_C() { - __copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, 0, mapping ); + _copyConstructData( pDest, pSource, pTypeDescr->pWeakRef, pTypeDescr, 0, mapping ); } //################################################################################################## sal_Bool SAL_CALL uno_type_equalData( @@ -236,7 +236,7 @@ sal_Bool SAL_CALL uno_type_equalData( uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - return __equalData( + return _equalData( pVal1, pVal1Type, 0, pVal2, pVal2Type, 0, queryInterface, release ); @@ -248,7 +248,7 @@ sal_Bool SAL_CALL uno_equalData( uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - return __equalData( + return _equalData( pVal1, pVal1TD->pWeakRef, pVal1TD, pVal2, pVal2TD->pWeakRef, pVal2TD, queryInterface, release ); @@ -260,7 +260,7 @@ sal_Bool SAL_CALL uno_type_assignData( uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - return __assignData( + return _assignData( pDest, pDestType, 0, pSource, pSourceType, 0, queryInterface, acquire, release ); @@ -272,7 +272,7 @@ sal_Bool SAL_CALL uno_assignData( uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release ) SAL_THROW_EXTERN_C() { - return __assignData( + return _assignData( pDest, pDestTD->pWeakRef, pDestTD, pSource, pSourceTD->pWeakRef, pSourceTD, queryInterface, acquire, release ); @@ -316,7 +316,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData( void * aArgs[1]; aArgs[0] = &pAssignable; - typelib_TypeDescription * pMTqueryInterface = __getQueryInterfaceTypeDescr(); + typelib_TypeDescription * pMTqueryInterface = _getQueryInterfaceTypeDescr(); (*((uno_Interface *)pInterface)->pDispatcher)( (uno_Interface *)pInterface, pMTqueryInterface, &aRet, aArgs, &pExc ); ::typelib_typedescription_release( pMTqueryInterface ); @@ -324,13 +324,13 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData( OSL_ENSURE( !pExc, "### Exception occured during queryInterface()!" ); if (pExc) { - __destructAny( pExc, 0 ); + _destructAny( pExc, 0 ); return sal_False; } else { sal_Bool ret = (typelib_TypeClass_INTERFACE == aRet.pType->eTypeClass); - __destructAny( &aRet, 0 ); + _destructAny( &aRet, 0 ); return ret; } } diff --git a/cppu/source/uno/destr.hxx b/cppu/source/uno/destr.hxx index bb1d77304753..5154e679df14 100644 --- a/cppu/source/uno/destr.hxx +++ b/cppu/source/uno/destr.hxx @@ -2,9 +2,9 @@ * * $RCSfile: destr.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: dbo $ $Date: 2001-06-29 11:06:54 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,28 +58,27 @@ * * ************************************************************************/ -#ifndef __DESTR_HXX__ -#define __DESTR_HXX__ +#ifndef DESTR_HXX +#define DESTR_HXX #include "prim.hxx" + namespace cppu { - //################################################################################################## //#### destruction ################################################################################# //################################################################################################## - //-------------------------------------------------------------------------------------------------- -inline void __destructUnion( +inline void _destructUnion( void * pValue, typelib_TypeDescription * pTypeDescr, uno_ReleaseFunc release ) SAL_THROW( () ) { - typelib_TypeDescriptionReference * pType = __unionGetSetType( pValue, pTypeDescr ); + typelib_TypeDescriptionReference * pType = _unionGetSetType( pValue, pTypeDescr ); ::uno_type_destructData( (char *)pValue + ((typelib_UnionTypeDescription *)pTypeDescr)->nValueOffset, pType, release ); @@ -92,7 +91,7 @@ void destructStruct( uno_ReleaseFunc release ) SAL_THROW( () ); //-------------------------------------------------------------------------------------------------- -inline void __destructStruct( +inline void _destructStruct( void * pValue, typelib_CompoundTypeDescription * pTypeDescr, uno_ReleaseFunc release ) @@ -114,7 +113,7 @@ inline void __destructStruct( } } //-------------------------------------------------------------------------------------------------- -inline void __destructArray( +inline void _destructArray( void * pValue, typelib_ArrayTypeDescription * pTypeDescr, uno_ReleaseFunc release ) @@ -142,7 +141,7 @@ void destructSequence( uno_ReleaseFunc release ) SAL_THROW( () ); //-------------------------------------------------------------------------------------------------- -inline void __destructAny( +inline void _destructAny( uno_Any * pAny, uno_ReleaseFunc release ) SAL_THROW( () ) @@ -192,7 +191,7 @@ inline void __destructAny( { typelib_TypeDescription * pTypeDescr = 0; TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __destructStruct( pAny->pData, (typelib_CompoundTypeDescription *)pTypeDescr, release ); + _destructStruct( pAny->pData, (typelib_CompoundTypeDescription *)pTypeDescr, release ); TYPELIB_DANGER_RELEASE( pTypeDescr ); ::rtl_freeMemory( pAny->pData ); break; @@ -201,7 +200,7 @@ inline void __destructAny( { typelib_TypeDescription * pTypeDescr = 0; TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __destructUnion( pAny->pData, pTypeDescr, release ); + _destructUnion( pAny->pData, pTypeDescr, release ); TYPELIB_DANGER_RELEASE( pTypeDescr ); ::rtl_freeMemory( pAny->pData ); break; @@ -218,7 +217,7 @@ inline void __destructAny( break; } case typelib_TypeClass_INTERFACE: - __releaseRef( &pAny->pReserved, release ); + _releaseRef( &pAny->pReserved, release ); break; } #ifdef _DEBUG @@ -228,7 +227,7 @@ inline void __destructAny( ::typelib_typedescriptionreference_release( pType ); } //-------------------------------------------------------------------------------------------------- -inline sal_Int32 __destructElements( +inline sal_Int32 _destructElements( void * pElements, typelib_TypeDescriptionReference * pElementType, sal_Int32 nStartIndex, sal_Int32 nStopIndex, uno_ReleaseFunc release ) @@ -279,7 +278,7 @@ inline sal_Int32 __destructElements( uno_Any * pDest = (uno_Any *)pElements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { - __destructAny( &pDest[nPos], release ); + _destructAny( &pDest[nPos], release ); } return sizeof(uno_Any); } @@ -298,7 +297,7 @@ inline sal_Int32 __destructElements( sal_Int32 nElementSize = pElementTypeDescr->nSize; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { - __destructStruct( + _destructStruct( (char *)pElements + (nElementSize * nPos), (typelib_CompoundTypeDescription *)pElementTypeDescr, release ); @@ -314,7 +313,7 @@ inline sal_Int32 __destructElements( sal_Int32 nElementSize = pElementTypeDescr->nSize; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { - __destructUnion( + _destructUnion( (char *)pElements + (nElementSize * nPos), pElementTypeDescr, release ); @@ -373,7 +372,7 @@ inline sal_Int32 __destructElements( return 0; } //-------------------------------------------------------------------------------------------------- -inline void __destructSequence( +inline void _destructSequence( uno_Sequence * pSequence, typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, @@ -386,14 +385,14 @@ inline void __destructSequence( { if (pTypeDescr) { - __destructElements( + _destructElements( pSequence->elements, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, 0, pSequence->nElements, release ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __destructElements( + _destructElements( pSequence->elements, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, 0, pSequence->nElements, release ); TYPELIB_DANGER_RELEASE( pTypeDescr ); @@ -403,7 +402,7 @@ inline void __destructSequence( } } //-------------------------------------------------------------------------------------------------- -inline void __destructData( +inline void _destructData( void * pValue, typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, @@ -419,7 +418,7 @@ inline void __destructData( ::typelib_typedescriptionreference_release( *(typelib_TypeDescriptionReference **)pValue ); break; case typelib_TypeClass_ANY: - __destructAny( (uno_Any *)pValue, release ); + _destructAny( (uno_Any *)pValue, release ); break; #ifdef CPPU_ASSERTIONS case typelib_TypeClass_TYPEDEF: @@ -430,45 +429,45 @@ inline void __destructData( case typelib_TypeClass_EXCEPTION: if (pTypeDescr) { - __destructStruct( pValue, (typelib_CompoundTypeDescription *)pTypeDescr, release ); + _destructStruct( pValue, (typelib_CompoundTypeDescription *)pTypeDescr, release ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __destructStruct( pValue, (typelib_CompoundTypeDescription *)pTypeDescr, release ); + _destructStruct( pValue, (typelib_CompoundTypeDescription *)pTypeDescr, release ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; case typelib_TypeClass_ARRAY: if (pTypeDescr) { - __destructArray( pValue, (typelib_ArrayTypeDescription *)pTypeDescr, release ); + _destructArray( pValue, (typelib_ArrayTypeDescription *)pTypeDescr, release ); } else { TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __destructArray( pValue, (typelib_ArrayTypeDescription *)pTypeDescr, release ); + _destructArray( pValue, (typelib_ArrayTypeDescription *)pTypeDescr, release ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; case typelib_TypeClass_UNION: if (pTypeDescr) { - __destructUnion( pValue, pTypeDescr, release ); + _destructUnion( pValue, pTypeDescr, release ); } else { typelib_TypeDescription * pTypeDescr = 0; TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __destructUnion( pValue, pTypeDescr, release ); + _destructUnion( pValue, pTypeDescr, release ); TYPELIB_DANGER_RELEASE( pTypeDescr ); } break; case typelib_TypeClass_SEQUENCE: - __destructSequence( *(uno_Sequence **)pValue, pType, pTypeDescr, release ); + _destructSequence( *(uno_Sequence **)pValue, pType, pTypeDescr, release ); break; case typelib_TypeClass_INTERFACE: - __releaseRef( (void **)pValue, release ); + _releaseRef( (void **)pValue, release ); break; } } diff --git a/cppu/source/uno/eq.hxx b/cppu/source/uno/eq.hxx index 2354db913135..7187c67f09e8 100644 --- a/cppu/source/uno/eq.hxx +++ b/cppu/source/uno/eq.hxx @@ -2,9 +2,9 @@ * * $RCSfile: eq.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: dbo $ $Date: 2001-06-29 11:06:54 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,8 +58,8 @@ * * ************************************************************************/ -#ifndef __EQ_HXX__ -#define __EQ_HXX__ +#ifndef EQ_HXX +#define EQ_HXX #include @@ -70,17 +70,16 @@ #include "prim.hxx" #include "destr.hxx" + namespace cppu { - //################################################################################################## //#### equality #################################################################################### //################################################################################################## - //-------------------------------------------------------------------------------------------------- -inline sal_Bool __unoEqualObject( void * pUnoI1, void * pUnoI2 ) +inline sal_Bool _unoEqualObject( void * pUnoI1, void * pUnoI2 ) SAL_THROW( () ) { if (pUnoI1 == pUnoI2) @@ -98,14 +97,14 @@ inline sal_Bool __unoEqualObject( void * pUnoI1, void * pUnoI2 ) uno_Any aRet1, aRet2, aExc; uno_Any * pExc = &aExc; - typelib_TypeDescription * pMTqueryInterface = __getQueryInterfaceTypeDescr(); + typelib_TypeDescription * pMTqueryInterface = _getQueryInterfaceTypeDescr(); (*((uno_Interface *)pUnoI1)->pDispatcher)( (uno_Interface *)pUnoI1, pMTqueryInterface, &aRet1, pArgs, &pExc ); OSL_ENSURE( !pExc, "### Exception occured during queryInterface()!" ); if (pExc) { - __destructAny( pExc, 0 ); + _destructAny( pExc, 0 ); } else { @@ -118,7 +117,7 @@ inline sal_Bool __unoEqualObject( void * pUnoI1, void * pUnoI2 ) OSL_ENSURE( !pExc, "### Exception occured during queryInterface()!" ); if (pExc) { - __destructAny( pExc, 0 ); + _destructAny( pExc, 0 ); } else { @@ -126,10 +125,10 @@ inline sal_Bool __unoEqualObject( void * pUnoI1, void * pUnoI2 ) { bRet = (*(void **)aRet1.pData == *(void **)aRet2.pData); } - __destructAny( &aRet2, 0 ); + _destructAny( &aRet2, 0 ); } } - __destructAny( &aRet1, 0 ); + _destructAny( &aRet1, 0 ); } typelib_typedescription_release( pMTqueryInterface ); @@ -137,7 +136,7 @@ inline sal_Bool __unoEqualObject( void * pUnoI1, void * pUnoI2 ) return bRet; } //-------------------------------------------------------------------------------------------------- -inline sal_Bool __equalObject( +inline sal_Bool _equalObject( void * pI1, void * pI2, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) SAL_THROW( () ) @@ -160,7 +159,7 @@ inline sal_Bool __equalObject( } return bRet; } - return __unoEqualObject( pI1, pI2 ); + return _unoEqualObject( pI1, pI2 ); } //================================================================================================== @@ -170,7 +169,7 @@ sal_Bool equalStruct( uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) SAL_THROW( () ); //-------------------------------------------------------------------------------------------------- -inline sal_Bool __equalStruct( +inline sal_Bool _equalStruct( void * pDest, void *pSource, typelib_CompoundTypeDescription * pTypeDescr, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) @@ -207,7 +206,7 @@ sal_Bool equalSequence( uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) SAL_THROW( () ); //-------------------------------------------------------------------------------------------------- -inline sal_Bool __equalSequence( +inline sal_Bool _equalSequence( uno_Sequence * pDest, uno_Sequence * pSource, typelib_TypeDescriptionReference * pElementType, uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release ) @@ -282,8 +281,8 @@ inline sal_Bool __equalSequence( { for ( sal_Int32 nPos = nElements; nPos--; ) { - if (! __type_equals( ((typelib_TypeDescriptionReference **)pDestElements)[nPos], - ((typelib_TypeDescriptionReference **)pSourceElements)[nPos] )) + if (! _type_equals( ((typelib_TypeDescriptionReference **)pDestElements)[nPos], + ((typelib_TypeDescriptionReference **)pSourceElements)[nPos] )) { return sal_False; } @@ -315,10 +314,10 @@ inline sal_Bool __equalSequence( sal_Int32 nElementSize = pElementTypeDescr->nSize; for ( sal_Int32 nPos = nElements; nPos--; ) { - if (! __equalStruct( (char *)pDestElements + (nPos * nElementSize), - (char *)pSourceElements + (nPos * nElementSize), - (typelib_CompoundTypeDescription *)pElementTypeDescr, - queryInterface, release )) + if (! _equalStruct( (char *)pDestElements + (nPos * nElementSize), + (char *)pSourceElements + (nPos * nElementSize), + (typelib_CompoundTypeDescription *)pElementTypeDescr, + queryInterface, release )) { TYPELIB_DANGER_RELEASE( pElementTypeDescr ); return sal_False; @@ -337,7 +336,8 @@ inline sal_Bool __equalSequence( { char * pDest = (char *)pDestElements + (nPos * nElementSize); char * pSource = (char *)pSourceElements + (nPos * nElementSize); - typelib_TypeDescriptionReference * pSetType = __unionGetSetType( pDest, pElementTypeDescr ); + typelib_TypeDescriptionReference * pSetType = _unionGetSetType( + pDest, pElementTypeDescr ); sal_Bool bRet = ::uno_type_equalData( pDest + nValueOffset, pSetType, pSource + nValueOffset, pSetType, @@ -375,8 +375,8 @@ inline sal_Bool __equalSequence( { for ( sal_Int32 nPos = nElements; nPos--; ) { - if (! __equalObject( ((void **)pDestElements)[nPos], ((void **)pSourceElements)[nPos], - queryInterface, release )) + if (! _equalObject( ((void **)pDestElements)[nPos], ((void **)pSourceElements)[nPos], + queryInterface, release )) { return sal_False; } @@ -387,7 +387,7 @@ inline sal_Bool __equalSequence( return sal_False; } //-------------------------------------------------------------------------------------------------- -inline sal_Bool __equalData( +inline sal_Bool _equalData( void * pDest, typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr, void * pSource, @@ -666,13 +666,13 @@ inline sal_Bool __equalData( switch (eSourceTypeClass) { case typelib_TypeClass_TYPE: - return __type_equals( + return _type_equals( *(typelib_TypeDescriptionReference **)pDest, *(typelib_TypeDescriptionReference **)pSource ); } return sal_False; case typelib_TypeClass_ENUM: - return (__type_equals( pDestType, pSourceType ) && + return (_type_equals( pDestType, pSourceType ) && *(sal_Int32 *)pDest == *(sal_Int32 *)pSource); #ifdef CPPU_ASSERTIONS case typelib_TypeClass_TYPEDEF: @@ -681,11 +681,11 @@ inline sal_Bool __equalData( #endif case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: - if (! __type_equals( pDestType, pSourceType )) + if (! _type_equals( pDestType, pSourceType )) return sal_False; if (pDestTypeDescr) { - return __equalStruct( + return _equalStruct( pDest, pSource, (typelib_CompoundTypeDescription *)pDestTypeDescr, queryInterface, release ); @@ -693,7 +693,7 @@ inline sal_Bool __equalData( else { TYPELIB_DANGER_GET( &pDestTypeDescr, pDestType ); - sal_Bool bRet = __equalStruct( + sal_Bool bRet = _equalStruct( pDest, pSource, (typelib_CompoundTypeDescription *)pDestTypeDescr, queryInterface, release ); @@ -701,26 +701,32 @@ inline sal_Bool __equalData( return bRet; } case typelib_TypeClass_UNION: - if (__type_equals( pDestType, pSourceType ) && + if (_type_equals( pDestType, pSourceType ) && *(sal_Int64 *)pDest == *(sal_Int64 *)pSource) // same discriminant { sal_Bool bRet; if (pDestTypeDescr) { - typelib_TypeDescriptionReference * pSetType = __unionGetSetType( pDest, pDestTypeDescr ); + typelib_TypeDescriptionReference * pSetType = _unionGetSetType( + pDest, pDestTypeDescr ); bRet = ::uno_type_equalData( - (char *)pDest + ((typelib_UnionTypeDescription *)pDestTypeDescr)->nValueOffset, pSetType, - (char *)pSource + ((typelib_UnionTypeDescription *)pDestTypeDescr)->nValueOffset, pSetType, + (char *)pDest + ((typelib_UnionTypeDescription *)pDestTypeDescr)->nValueOffset, + pSetType, + (char *)pSource + ((typelib_UnionTypeDescription *)pDestTypeDescr)->nValueOffset, + pSetType, queryInterface, release ); typelib_typedescriptionreference_release( pSetType ); } else { TYPELIB_DANGER_GET( &pDestTypeDescr, pDestType ); - typelib_TypeDescriptionReference * pSetType = __unionGetSetType( pDest, pDestTypeDescr ); + typelib_TypeDescriptionReference * pSetType = _unionGetSetType( + pDest, pDestTypeDescr ); bRet = ::uno_type_equalData( - (char *)pDest + ((typelib_UnionTypeDescription *)pDestTypeDescr)->nValueOffset, pSetType, - (char *)pSource + ((typelib_UnionTypeDescription *)pDestTypeDescr)->nValueOffset, pSetType, + (char *)pDest + ((typelib_UnionTypeDescription *)pDestTypeDescr)->nValueOffset, + pSetType, + (char *)pSource + ((typelib_UnionTypeDescription *)pDestTypeDescr)->nValueOffset, + pSetType, queryInterface, release ); typelib_typedescriptionreference_release( pSetType ); TYPELIB_DANGER_RELEASE( pDestTypeDescr ); @@ -729,11 +735,11 @@ inline sal_Bool __equalData( } return sal_False; case typelib_TypeClass_SEQUENCE: - if (__type_equals( pDestType, pSourceType )) + if (_type_equals( pDestType, pSourceType )) { if (pDestTypeDescr) { - return __equalSequence( + return _equalSequence( *(uno_Sequence **)pDest, *(uno_Sequence **)pSource, ((typelib_IndirectTypeDescription *)pDestTypeDescr)->pType, queryInterface, release ); @@ -741,7 +747,7 @@ inline sal_Bool __equalData( else { TYPELIB_DANGER_GET( &pDestTypeDescr, pDestType ); - sal_Bool bRet = __equalSequence( + sal_Bool bRet = _equalSequence( *(uno_Sequence **)pDest, *(uno_Sequence **)pSource, ((typelib_IndirectTypeDescription *)pDestTypeDescr)->pType, queryInterface, release ); @@ -752,7 +758,7 @@ inline sal_Bool __equalData( return sal_False; case typelib_TypeClass_INTERFACE: if (typelib_TypeClass_INTERFACE == eSourceTypeClass) - return __equalObject( *(void **)pDest, *(void **)pSource, queryInterface, release ); + return _equalObject( *(void **)pDest, *(void **)pSource, queryInterface, release ); } return sal_False; } diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index e38b2b4414a5..3e9f1ab723c4 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: lbenv.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: dbo $ $Date: 2002-08-19 13:02:55 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -818,7 +818,7 @@ static void SAL_CALL unoenv_computeObjectIdentifier( typelib_InterfaceTypeDescription * pTXInterfaceDescr = 0; const Type & rXIType = ::getCppuType( (const Reference< XInterface > *)0 ); - typelib_TypeDescription * pMTqueryInterface = __getQueryInterfaceTypeDescr(); + typelib_TypeDescription * pMTqueryInterface = _getQueryInterfaceTypeDescr(); void * pArgs[1]; pArgs[0] = const_cast< Type * >( &rXIType ); @@ -831,7 +831,7 @@ static void SAL_CALL unoenv_computeObjectIdentifier( OSL_ENSURE( !pExc, "### Exception occured during queryInterface()!" ); if (pExc) // cleanup exception object { - __destructAny( pExc, 0 ); + _destructAny( pExc, 0 ); } else { @@ -852,7 +852,7 @@ static void SAL_CALL unoenv_computeObjectIdentifier( OUString aStr( oid.makeStringAndClear() ); ::rtl_uString_acquire( *ppOId = aStr.pData ); } - __destructAny( &aRet, 0 ); + _destructAny( &aRet, 0 ); } typelib_typedescription_release( pMTqueryInterface ); diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx index 091db0ed17b7..4052d3ae32f8 100644 --- a/cppu/source/uno/prim.hxx +++ b/cppu/source/uno/prim.hxx @@ -2,9 +2,9 @@ * * $RCSfile: prim.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: dbo $ $Date: 2001-08-22 11:03:23 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,8 +58,8 @@ * * ************************************************************************/ -#ifndef __PRIM_HXX__ -#define __PRIM_HXX__ +#ifndef PRIM_HXX +#define PRIM_HXX #ifndef _TYPELIB_TYPEDESCRIPTION_H_ #include @@ -99,6 +99,7 @@ #include #include + namespace cppu { @@ -107,7 +108,7 @@ extern typelib_TypeDescriptionReference * g_pVoidType; extern typelib_TypeDescription * g_pQITD; //-------------------------------------------------------------------------------------------------- -inline void * __map( +inline void * _map( void * p, typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr, @@ -131,7 +132,7 @@ inline void * __map( return pRet; } //-------------------------------------------------------------------------------------------------- -inline void __acquire( void * p, uno_AcquireFunc acquire ) +inline void _acquire( void * p, uno_AcquireFunc acquire ) SAL_THROW( () ) { if (p) @@ -147,7 +148,7 @@ inline void __acquire( void * p, uno_AcquireFunc acquire ) } } //-------------------------------------------------------------------------------------------------- -inline void __releaseRef( void ** pRef, uno_ReleaseFunc release ) +inline void _releaseRef( void ** pRef, uno_ReleaseFunc release ) SAL_THROW( () ) { void * p = *pRef; @@ -165,13 +166,13 @@ inline void __releaseRef( void ** pRef, uno_ReleaseFunc release ) } //-------------------------------------------------------------------------------------------------- -inline uno_Sequence * __getEmptySequence() SAL_THROW( () ) +inline uno_Sequence * _getEmptySequence() SAL_THROW( () ) { ::osl_incrementInterlockedCount( &g_emptySeq.nRefCount ); return &g_emptySeq; } //-------------------------------------------------------------------------------------------------- -inline typelib_TypeDescriptionReference * __getVoidType() +inline typelib_TypeDescriptionReference * _getVoidType() SAL_THROW( () ) { if (! g_pVoidType) @@ -184,21 +185,21 @@ inline typelib_TypeDescriptionReference * __getVoidType() //-------------------------------------------------------------------------------------------------- #ifdef _DEBUG -#define __CONSTRUCT_EMPTY_ANY( pAny ) \ -(pAny)->pType = __getVoidType(); \ +#define CONSTRUCT_EMPTY_ANY( pAny ) \ +(pAny)->pType = _getVoidType(); \ (pAny)->pData = (void *)0xdeadbeef; #else -#define __CONSTRUCT_EMPTY_ANY( pAny ) \ -(pAny)->pType = __getVoidType(); \ +#define CONSTRUCT_EMPTY_ANY( pAny ) \ +(pAny)->pType = _getVoidType(); \ (pAny)->pData = (pAny); #endif //-------------------------------------------------------------------------------------------------- -#define __TYPE_ACQUIRE( pType ) \ +#define TYPE_ACQUIRE( pType ) \ ::osl_incrementInterlockedCount( &(pType)->nRefCount ); //-------------------------------------------------------------------------------------------------- -inline typelib_TypeDescription * __getQueryInterfaceTypeDescr() +inline typelib_TypeDescription * _getQueryInterfaceTypeDescr() SAL_THROW( () ) { if (! g_pQITD) @@ -222,7 +223,7 @@ inline typelib_TypeDescription * __getQueryInterfaceTypeDescr() } //-------------------------------------------------------------------------------------------------- -inline typelib_TypeDescriptionReference * __unionGetSetType( +inline typelib_TypeDescriptionReference * _unionGetSetType( void * pUnion, typelib_TypeDescription * pTD ) SAL_THROW( () ) { @@ -247,7 +248,7 @@ inline typelib_TypeDescriptionReference * __unionGetSetType( return pRet; } //-------------------------------------------------------------------------------------------------- -inline sal_Bool __type_equals( +inline sal_Bool _type_equals( typelib_TypeDescriptionReference * pType1, typelib_TypeDescriptionReference * pType2 ) SAL_THROW( () ) { diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx index b8204cc46820..83eb2d787e72 100644 --- a/cppu/source/uno/sequence.cxx +++ b/cppu/source/uno/sequence.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sequence.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: dbo $ $Date: 2001-07-06 11:30:09 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -110,7 +110,7 @@ static inline void allocSeq( } } //-------------------------------------------------------------------------------------------------- -static inline void __defaultConstructElements( +static inline void _defaultConstructElements( uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pElementType, sal_Int32 nStartIndex, sal_Int32 nStopIndex, @@ -200,7 +200,7 @@ static inline void __defaultConstructElements( (typelib_TypeDescriptionReference **)(*ppSequence)->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { - pElements[nPos] = __getVoidType(); + pElements[nPos] = _getVoidType(); } break; } @@ -211,7 +211,7 @@ static inline void __defaultConstructElements( uno_Any * pElements = (uno_Any *)(*ppSequence)->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { - __CONSTRUCT_EMPTY_ANY( &pElements[nPos] ); + CONSTRUCT_EMPTY_ANY( &pElements[nPos] ); } break; } @@ -248,7 +248,7 @@ static inline void __defaultConstructElements( char * pElements = (*ppSequence)->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { - __defaultConstructStruct( + _defaultConstructStruct( pElements + (nElementSize * nPos), (typelib_CompoundTypeDescription *)pElementTypeDescr ); } @@ -266,7 +266,7 @@ static inline void __defaultConstructElements( char * pElements = (*ppSequence)->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { - __defaultConstructArray( + _defaultConstructArray( pElements + (nElementSize * nPos), (typelib_ArrayTypeDescription *)pElementTypeDescr ); } @@ -306,7 +306,7 @@ static inline void __defaultConstructElements( uno_Sequence ** pElements = (uno_Sequence **)(*ppSequence)->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { - pElements[nPos] = __getEmptySequence(); + pElements[nPos] = _getEmptySequence(); } break; } @@ -320,7 +320,7 @@ static inline void __defaultConstructElements( } } //-------------------------------------------------------------------------------------------------- -static inline void __copyConstructElements( +static inline void _copyConstructElements( uno_Sequence ** ppSequence, void * pSourceElements, typelib_TypeDescriptionReference * pElementType, sal_Int32 nStartIndex, sal_Int32 nStopIndex, @@ -416,7 +416,7 @@ static inline void __copyConstructElements( (typelib_TypeDescriptionReference **)(*ppSequence)->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { - __TYPE_ACQUIRE( ((typelib_TypeDescriptionReference **)pSourceElements)[nPos] ); + TYPE_ACQUIRE( ((typelib_TypeDescriptionReference **)pSourceElements)[nPos] ); pDestElements[nPos] = ((typelib_TypeDescriptionReference **)pSourceElements)[nPos]; } break; @@ -429,7 +429,7 @@ static inline void __copyConstructElements( for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { uno_Any * pSource = (uno_Any *)pSourceElements + nPos; - __copyConstructAny( + _copyConstructAny( &pDestElements[nPos], pSource->pData, pSource->pType, 0, @@ -462,7 +462,8 @@ static inline void __copyConstructElements( if (pTypeDescr->pBaseTypeDescription) { // copy base value - __copyConstructStruct( pDest, pSource, pTypeDescr->pBaseTypeDescription, acquire, 0 ); + _copyConstructStruct( + pDest, pSource, pTypeDescr->pBaseTypeDescription, acquire, 0 ); } // then copy members @@ -497,7 +498,8 @@ static inline void __copyConstructElements( char * pDest = pDestElements + (nElementSize * nPos); char * pSource = (char *)pSourceElements + (nElementSize * nPos); - typelib_TypeDescriptionReference * pSetType = __unionGetSetType( pSource, pElementTypeDescr ); + typelib_TypeDescriptionReference * pSetType = _unionGetSetType( + pSource, pElementTypeDescr ); ::uno_type_copyData( pDest + nValueOffset, pSource + nValueOffset, @@ -517,7 +519,7 @@ static inline void __copyConstructElements( uno_Sequence ** pDestElements = (uno_Sequence **)(*ppSequence)->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { - __copyConstructSequence( + _copyConstructSequence( &pDestElements[nPos], ((uno_Sequence **)pSourceElements)[nPos], ((typelib_IndirectTypeDescription *)pElementTypeDescr)->pType, @@ -533,14 +535,14 @@ static inline void __copyConstructElements( void ** pDestElements = (void **)(*ppSequence)->elements; for ( sal_Int32 nPos = nStartIndex; nPos < nStopIndex; ++nPos ) { - __acquire( pDestElements[nPos] = ((void **)pSourceElements)[nPos], acquire ); + _acquire( pDestElements[nPos] = ((void **)pSourceElements)[nPos], acquire ); } break; } } } //-------------------------------------------------------------------------------------------------- -static inline void __reallocSequence( +static inline void _reallocSequence( uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pElementType, sal_Int32 nSize, @@ -565,14 +567,14 @@ static inline void __reallocSequence( if (nCopy >= 0) { - __copyConstructElements( + _copyConstructElements( &pNew, pSource->elements, pElementType, 0, nCopy, acquire, nSize ); // alloc to nSize } if (nRest > 0) { - __defaultConstructElements( + _defaultConstructElements( &pNew, pElementType, nCopy, nSize, nCopy >= 0 ? -1 /* already allocated */ : nSize ); @@ -583,7 +585,7 @@ static inline void __reallocSequence( { if ((*ppSequence)->nElements) { - __destructElements( + _destructElements( (*ppSequence)->elements, pElementType, 0, (*ppSequence)->nElements, release ); } ::rtl_freeMemory( *ppSequence ); @@ -595,14 +597,14 @@ static inline void __reallocSequence( { if (nSize > nSourceElements) // default construct the rest { - __defaultConstructElements( + _defaultConstructElements( ppSequence, pElementType, nSourceElements, nSize, nSize ); // realloc to nSize } else // or destruct the rest and realloc mem { - sal_Int32 nElementSize = __destructElements( + sal_Int32 nElementSize = _destructElements( (*ppSequence)->elements, pElementType, nSize, nSourceElements, release ); *ppSequence = (uno_Sequence *)::rtl_reallocateMemory( @@ -635,14 +637,14 @@ void SAL_CALL uno_type_sequence_construct( if (pElements) { - __copyConstructElements( + _copyConstructElements( &pSequence, pElements, pElementType, 0, len, acquire, len ); // alloc to len } else { - __defaultConstructElements( + _defaultConstructElements( &pSequence, pElementType, 0, len, @@ -655,7 +657,7 @@ void SAL_CALL uno_type_sequence_construct( } else { - *ppSequence = __getEmptySequence(); + *ppSequence = _getEmptySequence(); } } //################################################################################################## @@ -674,14 +676,14 @@ void SAL_CALL uno_sequence_construct( if (pElements) { - __copyConstructElements( + _copyConstructElements( &pSequence, pElements, pElementType, 0, len, acquire, len ); // alloc to len } else { - __defaultConstructElements( + _defaultConstructElements( &pSequence, pElementType, 0, len, @@ -692,7 +694,7 @@ void SAL_CALL uno_sequence_construct( } else { - *ppSequence = __getEmptySequence(); + *ppSequence = _getEmptySequence(); } } //################################################################################################## @@ -708,7 +710,7 @@ void SAL_CALL uno_type_sequence_realloc( { typelib_TypeDescription * pTypeDescr = 0; TYPELIB_DANGER_GET( &pTypeDescr, pType ); - __reallocSequence( + _reallocSequence( ppSequence, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, nSize, acquire, release ); TYPELIB_DANGER_RELEASE( pTypeDescr ); @@ -725,7 +727,7 @@ void SAL_CALL uno_sequence_realloc( if (nSize != (*ppSequence)->nElements) { - __reallocSequence( + _reallocSequence( ppSequence, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, nSize, acquire, release ); } @@ -747,20 +749,20 @@ void SAL_CALL uno_type_sequence_reference2One( TYPELIB_DANGER_GET( &pTypeDescr, pType ); uno_Sequence * pNew = 0; - __copyConstructElements( + _copyConstructElements( &pNew, pSequence->elements, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, 0, pSequence->nElements, acquire, pSequence->nElements ); // alloc nElements - __destructSequence( *ppSequence, pType, pTypeDescr, release ); + _destructSequence( *ppSequence, pType, pTypeDescr, release ); *ppSequence = pNew; TYPELIB_DANGER_RELEASE( pTypeDescr ); } else { - __destructSequence( *ppSequence, pType, 0, release ); + _destructSequence( *ppSequence, pType, 0, release ); uno_Sequence * pNew = (uno_Sequence *)::rtl_allocateMemory( SAL_SEQUENCE_HEADER_SIZE ); pNew->nRefCount = 1; @@ -783,18 +785,18 @@ void SAL_CALL uno_sequence_reference2One( if (pSequence->nElements) { uno_Sequence * pNew = 0; - __copyConstructElements( + _copyConstructElements( &pNew, pSequence->elements, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType, 0, pSequence->nElements, acquire, pSequence->nElements ); // alloc nElements - __destructSequence( *ppSequence, pTypeDescr->pWeakRef, pTypeDescr, release ); + _destructSequence( *ppSequence, pTypeDescr->pWeakRef, pTypeDescr, release ); *ppSequence = pNew; } else { - __destructSequence( *ppSequence, pTypeDescr->pWeakRef, pTypeDescr, release ); + _destructSequence( *ppSequence, pTypeDescr->pWeakRef, pTypeDescr, release ); uno_Sequence * pNew = (uno_Sequence *)::rtl_allocateMemory( SAL_SEQUENCE_HEADER_SIZE ); pNew->nRefCount = 1; @@ -814,7 +816,7 @@ void SAL_CALL uno_sequence_assign( if (*ppDest != pSource) { ::osl_incrementInterlockedCount( &pSource->nRefCount ); - __destructSequence( *ppDest, pTypeDescr->pWeakRef, pTypeDescr, release ); + _destructSequence( *ppDest, pTypeDescr->pWeakRef, pTypeDescr, release ); *ppDest = pSource; } } @@ -829,7 +831,7 @@ void SAL_CALL uno_type_sequence_assign( if (*ppDest != pSource) { ::osl_incrementInterlockedCount( &pSource->nRefCount ); - __destructSequence( *ppDest, pType, 0, release ); + _destructSequence( *ppDest, pType, 0, release ); *ppDest = pSource; } } diff --git a/cppu/test/alignment/diagnose.h b/cppu/test/alignment/diagnose.h index d03f6a5011d1..097a374076ce 100644 --- a/cppu/test/alignment/diagnose.h +++ b/cppu/test/alignment/diagnose.h @@ -2,9 +2,9 @@ * * $RCSfile: diagnose.h,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dbo $ $Date: 2001-10-17 12:40:31 $ + * last change: $Author: dbo $ $Date: 2002-08-21 09:19:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,16 +58,16 @@ * * ************************************************************************/ -#ifndef __SHARE_H__ -#define __SHARE_H__ +#ifndef DIAGNOSE_H +#define DIAGNOSE_H #include #include #if defined(__GNUC__) && defined(LINUX) && defined(INTEL) -#define __ALIGNMENT__(s, n) __alignof__ (s) +#define ALIGNMENT(s, n) __alignof__ (s) #else -#define __ALIGNMENT__(s, n) n +#define ALIGNMENT(s, n) n #endif #define OFFSET_OF( s, m ) ((sal_Size)((char *)&((s *)16)->m -16)) @@ -84,8 +84,8 @@ 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(); } #define BINTEST_VERIFYALIGNMENT( s, n ) \ - fprintf( stderr, "> alignment of " #s " = %d\n", __ALIGNMENT__(s, n) ); \ - if (__ALIGNMENT__(s, n) != n) { fprintf( stderr, "### alignment of " #s " = %d instead of expected %d!!!\n", __ALIGNMENT__(s, n), n ); abort(); } + fprintf( stderr, "> alignment of " #s " = %d\n", ALIGNMENT(s, n) ); \ + if (ALIGNMENT(s, n) != n) { fprintf( stderr, "### alignment of " #s " = %d instead of expected %d!!!\n", ALIGNMENT(s, n), n ); abort(); } #else @@ -94,7 +94,7 @@ #define BINTEST_VERIFYSIZE( s, n ) \ if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); } #define BINTEST_VERIFYALIGNMENT( s, n ) \ - if (__ALIGNMENT__(s, n) != n) { fprintf( stderr, "### alignment of " #s " = %d instead of expected %d!!!\n", __ALIGNMENT__(s, n), n ); abort(); } + if (ALIGNMENT(s, n) != n) { fprintf( stderr, "### alignment of " #s " = %d instead of expected %d!!!\n", ALIGNMENT(s, n), n ); abort(); } #endif diff --git a/cppu/util/cppu.map b/cppu/util/cppu.map index c146ac03597c..fd031c8421f1 100755 --- a/cppu/util/cppu.map +++ b/cppu/util/cppu.map @@ -93,7 +93,7 @@ UDK_3_0_0 { uno_threadpool_attach; uno_threadpool_detach; - __cppu_unsatisfied_query_msg; + cppu_unsatisfied_iquery_msg; local: *; }; -- cgit v1.2.3