diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /cppu | |
parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cppu')
-rw-r--r-- | cppu/source/threadpool/current.cxx | 6 | ||||
-rw-r--r-- | cppu/source/threadpool/thread.cxx | 4 | ||||
-rw-r--r-- | cppu/source/threadpool/threadpool.cxx | 2 | ||||
-rw-r--r-- | cppu/source/typelib/static_types.cxx | 8 | ||||
-rw-r--r-- | cppu/source/typelib/typelib.cxx | 60 | ||||
-rw-r--r-- | cppu/source/uno/data.cxx | 2 | ||||
-rw-r--r-- | cppu/source/uno/lbenv.cxx | 58 | ||||
-rw-r--r-- | cppu/source/uno/lbmap.cxx | 26 | ||||
-rw-r--r-- | cppu/source/uno/sequence.cxx | 8 |
9 files changed, 87 insertions, 87 deletions
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx index 0b8f5ab70b04..bb64202fd170 100644 --- a/cppu/source/threadpool/current.cxx +++ b/cppu/source/threadpool/current.cxx @@ -108,13 +108,13 @@ public: inline ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW(()); inline ~ThreadKey() SAL_THROW(()); }; -//__________________________________________________________________________________________________ + inline ThreadKey::ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW(()) : _bInit( false ) , _pCallback( pCallback ) { } -//__________________________________________________________________________________________________ + inline ThreadKey::~ThreadKey() SAL_THROW(()) { if (_bInit) @@ -122,7 +122,7 @@ inline ThreadKey::~ThreadKey() SAL_THROW(()) ::osl_destroyThreadKey( _hThreadKey ); } } -//__________________________________________________________________________________________________ + inline oslThreadKey ThreadKey::getThreadKey() SAL_THROW(()) { if (! _bInit) diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx index e8a64c685390..3cab23d50aa2 100644 --- a/cppu/source/threadpool/thread.cxx +++ b/cppu/source/threadpool/thread.cxx @@ -35,7 +35,7 @@ using namespace osl; namespace cppu_threadpool { -// ---------------------------------------------------------------------------------- + ThreadAdmin::ThreadAdmin(): m_disposed(false) {} ThreadAdmin::~ThreadAdmin() @@ -99,7 +99,7 @@ namespace cppu_threadpool { } } -// ---------------------------------------------------------------------------------- + ORequestThread::ORequestThread( ThreadPoolHolder const &aThreadPool, JobQueue *pQueue, const ByteSequence &aThreadId, diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 493ab25f6abd..787977ff7421 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -98,7 +98,7 @@ namespace cppu_threadpool } - //------------------------------------------------------------------------------- + ThreadPool::ThreadPool() { diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index c53d21a90cf6..8f46cec3ff66 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -40,19 +40,19 @@ using ::rtl::OUStringBuffer; extern "C" { -//------------------------------------------------------------------------ + sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize( const typelib_TypeDescription * pTypeDescription, sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize ) SAL_THROW_EXTERN_C(); -//------------------------------------------------------------------------ + void SAL_CALL typelib_typedescription_newEmpty( typelib_TypeDescription ** ppRet, typelib_TypeClass eTypeClass, rtl_uString * pTypeName ) SAL_THROW_EXTERN_C(); -//----------------------------------------------------------------------------- + void SAL_CALL typelib_typedescriptionreference_getByName( typelib_TypeDescriptionReference ** ppRet, rtl_uString * pName ) @@ -107,7 +107,7 @@ static inline sal_Int32 newAlignedSize( return (OldSize + NeededAlignment -1) / NeededAlignment * NeededAlignment + ElementSize; } -//-------------------------------------------------------------------------------------------------- + namespace { diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 25123c59b65a..24ef0bf8e904 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -151,19 +151,19 @@ static inline sal_Int32 getDescriptionSize( typelib_TypeClass eTypeClass ) } -//----------------------------------------------------------------------------- + extern "C" void SAL_CALL typelib_typedescriptionreference_getByName( typelib_TypeDescriptionReference ** ppRet, rtl_uString * pName ) SAL_THROW_EXTERN_C(); -//----------------------------------------------------------------------------- + struct equalStr_Impl { bool operator()(const sal_Unicode * const & s1, const sal_Unicode * const & s2) const SAL_THROW(()) { return 0 == rtl_ustr_compare( s1, s2 ); } }; -//----------------------------------------------------------------------------- + struct hashStr_Impl { size_t operator()(const sal_Unicode * const & s) const SAL_THROW(()) @@ -171,7 +171,7 @@ struct hashStr_Impl }; -//----------------------------------------------------------------------------- + // Heavy hack, the const sal_Unicode * is hold by the typedescription reference typedef boost::unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *, hashStr_Impl, equalStr_Impl > WeakMap_Impl; @@ -225,7 +225,7 @@ struct TypeDescriptor_Init_Impl ~TypeDescriptor_Init_Impl() SAL_THROW(()); }; -//__________________________________________________________________________________________________ + inline Mutex & TypeDescriptor_Init_Impl::getMutex() SAL_THROW(()) { if( !pMutex ) @@ -236,7 +236,7 @@ inline Mutex & TypeDescriptor_Init_Impl::getMutex() SAL_THROW(()) } return * pMutex; } -//__________________________________________________________________________________________________ + inline void TypeDescriptor_Init_Impl::callChain( typelib_TypeDescription ** ppRet, rtl_uString * pName ) SAL_THROW(()) @@ -257,7 +257,7 @@ inline void TypeDescriptor_Init_Impl::callChain( } } -//__________________________________________________________________________________________________ + TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW(()) { if( pCache ) @@ -359,7 +359,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_registerCallback rInit.pCallbacks->push_back( CallbackEntry( pContext, pCallback ) ); } -//------------------------------------------------------------------------ + extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_revokeCallback( void * pContext, typelib_typedescription_Callback pCallback ) SAL_THROW_EXTERN_C() @@ -391,7 +391,7 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize( sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize ) SAL_THROW_EXTERN_C(); -//------------------------------------------------------------------------ + static inline void typelib_typedescription_initTables( typelib_TypeDescription * pTD ) SAL_THROW(()) @@ -563,7 +563,7 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool initTables) { } -//------------------------------------------------------------------------ + extern "C" void SAL_CALL typelib_typedescription_newEmpty( typelib_TypeDescription ** ppRet, typelib_TypeClass eTypeClass, rtl_uString * pTypeName ) @@ -723,7 +723,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty( *ppRet = pRet; } -//------------------------------------------------------------------------ + namespace { void newTypeDescription( @@ -874,7 +874,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newStruct( pMembers); } -//------------------------------------------------------------------------ + extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newEnum( typelib_TypeDescription ** ppRet, rtl_uString * pTypeName, @@ -903,7 +903,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newEnum( (*ppRet)->nAlignment = adjustAlignment( (*ppRet)->nAlignment ); } -//------------------------------------------------------------------------ + extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterface( typelib_InterfaceTypeDescription ** ppRet, rtl_uString * pTypeName, @@ -920,7 +920,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterface( &pBaseInterface, nMembers, ppMembers); } -//------------------------------------------------------------------------ + namespace { @@ -1101,7 +1101,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newMIInterface( *ppRet = pITD; } -//------------------------------------------------------------------------ + namespace { @@ -1203,7 +1203,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceMeth } -//------------------------------------------------------------------------ + extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceAttribute( typelib_InterfaceAttributeTypeDescription ** ppRet, sal_Int32 nAbsolutePosition, @@ -1218,7 +1218,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceAttr pAttributeTypeName, bReadOnly, 0, 0, 0, 0); } -//------------------------------------------------------------------------ + extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute( typelib_InterfaceAttributeTypeDescription ** ppRet, sal_Int32 nAbsolutePosition, @@ -1281,7 +1281,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newExtendedInter pTmp->pWeakRef = (typelib_TypeDescriptionReference *)pTmp; } -//------------------------------------------------------------------------ + extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_acquire( typelib_TypeDescription * pTypeDescription ) SAL_THROW_EXTERN_C() @@ -1289,7 +1289,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_acquire( osl_atomic_increment( &pTypeDescription->nRefCount ); } -//------------------------------------------------------------------------ + namespace { @@ -1411,7 +1411,7 @@ static inline void typelib_typedescription_destructExtendedMembers( } } -//------------------------------------------------------------------------ + extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_release( typelib_TypeDescription * pTD ) SAL_THROW_EXTERN_C() @@ -1482,7 +1482,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_release( } } -//------------------------------------------------------------------------ + extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_register( typelib_TypeDescription ** ppNewDescription ) SAL_THROW_EXTERN_C() @@ -1616,7 +1616,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_register( OSL_ASSERT( pTDR->eTypeClass == (*ppNewDescription)->eTypeClass ); } -//------------------------------------------------------------------------ + static inline bool type_equals( typelib_TypeDescriptionReference * p1, typelib_TypeDescriptionReference * p2 ) SAL_THROW(()) @@ -1634,7 +1634,7 @@ extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_equals( (typelib_TypeDescriptionReference *)p1, (typelib_TypeDescriptionReference *)p2 ); } -//------------------------------------------------------------------------ + extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize( const typelib_TypeDescription * pTypeDescription, sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize ) @@ -1771,7 +1771,7 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize( return newAlignedSize( nOffset, nSize, rMaxIntegralTypeSize ); } -//------------------------------------------------------------------------ + namespace { @@ -2079,7 +2079,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_newByAs OUString aTypeName( OUString::createFromAscii( pTypeName ) ); typelib_typedescriptionreference_new( ppTDR, eTypeClass, aTypeName.pData ); } -//------------------------------------------------------------------------ + extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_new( typelib_TypeDescriptionReference ** ppTDR, typelib_TypeClass eTypeClass, rtl_uString * pTypeName ) @@ -2176,7 +2176,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_new( rInit.pWeakMap->operator[]( (*ppTDR)->pTypeName->buffer ) = *ppTDR; } -//------------------------------------------------------------------------ + extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_acquire( typelib_TypeDescriptionReference * pRef ) SAL_THROW_EXTERN_C() @@ -2184,7 +2184,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_acquire osl_atomic_increment( &pRef->nRefCount ); } -//------------------------------------------------------------------------ + extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_release( typelib_TypeDescriptionReference * pRef ) SAL_THROW_EXTERN_C() @@ -2220,7 +2220,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_release } } -//------------------------------------------------------------------------ + extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_getDescription( typelib_TypeDescription ** ppRet, typelib_TypeDescriptionReference * pRef ) SAL_THROW_EXTERN_C() @@ -2269,7 +2269,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_getDesc pRef->pType = *ppRet; } -//------------------------------------------------------------------------ + extern "C" void SAL_CALL typelib_typedescriptionreference_getByName( typelib_TypeDescriptionReference ** ppRet, rtl_uString * pName ) SAL_THROW_EXTERN_C() @@ -2303,7 +2303,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_getByName( } } -//------------------------------------------------------------------------ + extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescriptionreference_equals( const typelib_TypeDescriptionReference * p1, const typelib_TypeDescriptionReference * p2 ) diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index da358d62a141..f7d8a76fc045 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -46,7 +46,7 @@ namespace cppu uno_Sequence g_emptySeq = { 1, 0, { 0 } }; typelib_TypeDescriptionReference * g_pVoidType = 0; -//-------------------------------------------------------------------------------------------------- + void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * pDestType ) { // init queryInterface() td diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 5b45be29d411..9f7cc77325bd 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -51,7 +51,7 @@ using ::rtl::OUString; namespace { -//------------------------------------------------------------------------------ + inline static bool td_equals( typelib_InterfaceTypeDescription * pTD1, typelib_InterfaceTypeDescription * pTD2 ) { @@ -66,7 +66,7 @@ inline static bool td_equals( typelib_InterfaceTypeDescription * pTD1, struct ObjectEntry; struct uno_DefaultEnvironment; -//------------------------------------------------------------------------------ + struct InterfaceEntry { sal_Int32 refCount; @@ -93,7 +93,7 @@ struct ObjectEntry inline sal_Int32 find( void * iface_ptr, ::std::size_t pos ); }; -//------------------------------------------------------------------------------ + struct FctPtrHash : public ::std::unary_function< const void *, ::std::size_t > { @@ -101,7 +101,7 @@ struct FctPtrHash : { return (::std::size_t) pKey; } }; -//------------------------------------------------------------------------------ + struct FctOUStringHash : public ::std::unary_function< const OUString &, ::std::size_t > { @@ -163,7 +163,7 @@ struct uno_DefaultEnvironment : public uno_ExtEnvironment ~uno_DefaultEnvironment(); }; -//______________________________________________________________________________ + inline ObjectEntry::ObjectEntry( OUString const & rOId_ ) : oid( rOId_ ), nRef( 0 ), @@ -172,7 +172,7 @@ inline ObjectEntry::ObjectEntry( OUString const & rOId_ ) aInterfaces.reserve( 2 ); } -//______________________________________________________________________________ + inline void ObjectEntry::append( uno_DefaultEnvironment * pEnv, void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr, @@ -198,7 +198,7 @@ inline void ObjectEntry::append( aInterfaces.push_back( aNewEntry ); } -//______________________________________________________________________________ + inline InterfaceEntry * ObjectEntry::find( typelib_InterfaceTypeDescription * pTypeDescr_ ) { @@ -230,7 +230,7 @@ inline InterfaceEntry * ObjectEntry::find( return 0; } -//______________________________________________________________________________ + inline sal_Int32 ObjectEntry::find( void * iface_ptr, ::std::size_t pos ) { @@ -246,7 +246,7 @@ inline sal_Int32 ObjectEntry::find( extern "C" { -//------------------------------------------------------------------------------ + static void SAL_CALL defenv_registerInterface( uno_ExtEnvironment * pEnv, void ** ppInterface, rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr ) @@ -293,7 +293,7 @@ static void SAL_CALL defenv_registerInterface( } } -//------------------------------------------------------------------------------ + static void SAL_CALL defenv_registerProxyInterface( uno_ExtEnvironment * pEnv, void ** ppInterface, uno_freeProxyFunc freeProxy, rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr ) @@ -351,7 +351,7 @@ static void SAL_CALL defenv_registerProxyInterface( } } -//------------------------------------------------------------------------------ + static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam) { uno_ExtEnvironment * pEnv = va_arg(*pParam, uno_ExtEnvironment *); @@ -447,7 +447,7 @@ static void SAL_CALL defenv_revokeInterface(uno_ExtEnvironment * pEnv, void * pI uno_Environment_invoke(&pEnv->aBase, s_stub_defenv_revokeInterface, pEnv, pInterface); } -//------------------------------------------------------------------------------ + static void SAL_CALL defenv_getObjectIdentifier( uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface ) { @@ -477,7 +477,7 @@ static void SAL_CALL defenv_getObjectIdentifier( } } -//------------------------------------------------------------------------------ + static void SAL_CALL defenv_getRegisteredInterface( uno_ExtEnvironment * pEnv, void ** ppInterface, rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr ) @@ -507,7 +507,7 @@ static void SAL_CALL defenv_getRegisteredInterface( } } -//------------------------------------------------------------------------------ + static void SAL_CALL defenv_getRegisteredInterfaces( uno_ExtEnvironment * pEnv, void *** pppInterfaces, sal_Int32 * pnLen, uno_memAlloc memAlloc ) @@ -533,7 +533,7 @@ static void SAL_CALL defenv_getRegisteredInterfaces( *pnLen = nLen; } -//------------------------------------------------------------------------------ + static void SAL_CALL defenv_acquire( uno_Environment * pEnv ) { uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; @@ -541,7 +541,7 @@ static void SAL_CALL defenv_acquire( uno_Environment * pEnv ) osl_atomic_increment( &that->nRef ); } -//------------------------------------------------------------------------------ + static void SAL_CALL defenv_release( uno_Environment * pEnv ) { uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; @@ -562,14 +562,14 @@ static void SAL_CALL defenv_release( uno_Environment * pEnv ) } } -//------------------------------------------------------------------------------ + static void SAL_CALL defenv_acquireWeak( uno_Environment * pEnv ) { uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; osl_atomic_increment( &that->nWeakRef ); } -//------------------------------------------------------------------------------ + static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv ) { uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; @@ -579,7 +579,7 @@ static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv ) } } -//------------------------------------------------------------------------------ + static void SAL_CALL defenv_harden( uno_Environment ** ppHardEnv, uno_Environment * pEnv ) { @@ -607,13 +607,13 @@ static void SAL_CALL defenv_harden( *ppHardEnv = pEnv; } -//------------------------------------------------------------------------------ + static void SAL_CALL defenv_dispose( SAL_UNUSED_PARAMETER uno_Environment * ) { } } -//______________________________________________________________________________ + uno_DefaultEnvironment::uno_DefaultEnvironment( const OUString & rEnvDcp_, void * pContext_ ) : nRef( 0 ), @@ -647,7 +647,7 @@ uno_DefaultEnvironment::uno_DefaultEnvironment( } -//______________________________________________________________________________ + uno_DefaultEnvironment::~uno_DefaultEnvironment() { ::rtl_uString_release( ((uno_Environment *) this)->pTypeName ); @@ -851,7 +851,7 @@ namespace class theStaticOIdPart : public rtl::Static<makeOIdPart, theStaticOIdPart> {}; } -//------------------------------------------------------------------------------ + inline static const OUString & unoenv_getStaticOIdPart() { return theStaticOIdPart::get().getOIdPart(); @@ -860,7 +860,7 @@ inline static const OUString & unoenv_getStaticOIdPart() extern "C" { -//------------------------------------------------------------------------------ + static void SAL_CALL unoenv_computeObjectIdentifier( uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface ) { @@ -912,7 +912,7 @@ static void SAL_CALL unoenv_releaseInterface( } } -//______________________________________________________________________________ + EnvironmentsData::~EnvironmentsData() { ::osl::MutexGuard guard( mutex ); @@ -937,7 +937,7 @@ EnvironmentsData::~EnvironmentsData() } } -//______________________________________________________________________________ + inline void EnvironmentsData::getEnvironment( uno_Environment ** ppEnv, const OUString & rEnvDcp, void * pContext ) { @@ -961,7 +961,7 @@ inline void EnvironmentsData::getEnvironment( } } -//______________________________________________________________________________ + inline void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv ) { OSL_ENSURE( ppEnv, "### null ptr!" ); @@ -1001,7 +1001,7 @@ inline void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv ) } } -//______________________________________________________________________________ + inline void EnvironmentsData::getRegisteredEnvironments( uno_Environment *** pppEnvs, sal_Int32 * pnLen, uno_memAlloc memAlloc, const OUString & rEnvDcp ) @@ -1091,7 +1091,7 @@ static bool loadEnv(OUString const & cLibStem, extern "C" { -//------------------------------------------------------------------------------ + static uno_Environment * initDefaultEnvironment( const OUString & rEnvDcp, void * pContext ) { diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index aa8cde9dde7c..ef8a0eec7bea 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -71,27 +71,27 @@ public: inline bool SAL_CALL is() const SAL_THROW(()) { return (_pMapping != 0); } }; -//__________________________________________________________________________________________________ + inline Mapping::Mapping( uno_Mapping * pMapping ) SAL_THROW(()) : _pMapping( pMapping ) { if (_pMapping) (*_pMapping->acquire)( _pMapping ); } -//__________________________________________________________________________________________________ + inline Mapping::Mapping( const Mapping & rMapping ) SAL_THROW(()) : _pMapping( rMapping._pMapping ) { if (_pMapping) (*_pMapping->acquire)( _pMapping ); } -//__________________________________________________________________________________________________ + inline Mapping::~Mapping() SAL_THROW(()) { if (_pMapping) (*_pMapping->release)( _pMapping ); } -//__________________________________________________________________________________________________ + inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW(()) { if (pMapping) @@ -120,13 +120,13 @@ struct MappingEntry , aMappingName( rMappingName_ ) {} }; -//-------------------------------------------------------------------------------------------------- + struct FctOUStringHash : public std::unary_function< const OUString &, size_t > { size_t operator()( const OUString & rKey ) const SAL_THROW(()) { return (size_t)rKey.hashCode(); } }; -//-------------------------------------------------------------------------------------------------- + struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t > { size_t operator()( uno_Mapping * pKey ) const SAL_THROW(()) @@ -154,7 +154,7 @@ struct MappingsData Mutex aNegativeLibsMutex; t_OUStringSet aNegativeLibs; }; -//-------------------------------------------------------------------------------------------------- + static MappingsData & getMappingsData() SAL_THROW(()) { static MappingsData * s_p = 0; @@ -195,13 +195,13 @@ struct uno_Mediate_Mapping : public uno_Mapping }; extern "C" { -//-------------------------------------------------------------------------------------------------- + static void SAL_CALL mediate_free( uno_Mapping * pMapping ) SAL_THROW(()) { delete static_cast< uno_Mediate_Mapping * >( pMapping ); } -//-------------------------------------------------------------------------------------------------- + static void SAL_CALL mediate_acquire( uno_Mapping * pMapping ) SAL_THROW(()) { @@ -215,7 +215,7 @@ static void SAL_CALL mediate_acquire( uno_Mapping * pMapping ) static_cast< uno_Mediate_Mapping * >( pMapping )->aAddPurpose.pData ); } } -//-------------------------------------------------------------------------------------------------- + static void SAL_CALL mediate_release( uno_Mapping * pMapping ) SAL_THROW(()) { @@ -225,7 +225,7 @@ static void SAL_CALL mediate_release( uno_Mapping * pMapping ) uno_revokeMapping( pMapping ); } } -//-------------------------------------------------------------------------------------------------- + static void SAL_CALL mediate_mapInterface( uno_Mapping * pMapping, void ** ppOut, void * pInterface, @@ -261,7 +261,7 @@ static void SAL_CALL mediate_mapInterface( } } } -//__________________________________________________________________________________________________ + uno_Mediate_Mapping::uno_Mediate_Mapping( const Environment & rFrom_, const Environment & rTo_, const Mapping & rFrom2Uno_, const Mapping & rUno2To_, @@ -487,7 +487,7 @@ static Mapping getDirectMapping( return Mapping(); } -//-------------------------------------------------------------------------------------------------- + static inline Mapping createMediateMapping( const Environment & rFrom, const Environment & rTo, const Mapping & rFrom2Uno, const Mapping & rUno2To, diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx index 03198c175353..007e5a801d8f 100644 --- a/cppu/source/uno/sequence.cxx +++ b/cppu/source/uno/sequence.cxx @@ -40,7 +40,7 @@ using namespace cppu; namespace cppu { -//------------------------------------------------------------------------------ + static inline uno_Sequence * reallocSeq( uno_Sequence * pReallocate, sal_Size nElementSize, sal_Int32 nElements ) { @@ -67,7 +67,7 @@ static inline uno_Sequence * reallocSeq( return pNew; } -//------------------------------------------------------------------------------ + static inline bool idefaultConstructElements( uno_Sequence ** ppSeq, typelib_TypeDescriptionReference * pElementType, @@ -309,7 +309,7 @@ static inline bool idefaultConstructElements( } } -//------------------------------------------------------------------------------ + static inline bool icopyConstructFromElements( uno_Sequence ** ppSeq, void * pSourceElements, typelib_TypeDescriptionReference * pElementType, @@ -587,7 +587,7 @@ static inline bool icopyConstructFromElements( } } -//------------------------------------------------------------------------------ + static inline bool ireallocSequence( uno_Sequence ** ppSequence, typelib_TypeDescriptionReference * pElementType, |