diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:31:01 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:31:01 +0000 |
| commit | a6c7bb0eeb43ca4374dca8aea4598dba11206e8e (patch) | |
| tree | 1c1b34d472ef1cfc1ed48ed8e5389421e12b5dca /cppuhelper/inc | |
| parent | 9fa49cfe6261f994dab02d16a3d60caeb105ae8d (diff) | |
INTEGRATION: CWS warnings01 (1.5.4); FILE MERGED
2006/03/10 15:38:16 sb 1.5.4.3: #i53898# Made code warning-free.
2005/11/30 16:09:39 sb 1.5.4.2: #i53898# Made code warning-free.
2005/11/10 14:18:11 pl 1.5.4.1: #i55991# removed warnings
Diffstat (limited to 'cppuhelper/inc')
| -rw-r--r-- | cppuhelper/inc/cppuhelper/interfacecontainer.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx index cfa0bbcd0..b828a551d 100644 --- a/cppuhelper/inc/cppuhelper/interfacecontainer.hxx +++ b/cppuhelper/inc/cppuhelper/interfacecontainer.hxx @@ -4,9 +4,9 @@ * * $RCSfile: interfacecontainer.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 09:19:16 $ + * last change: $Author: hr $ $Date: 2006-06-19 10:31:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,10 +73,9 @@ template< class key , class hashImpl , class equalImpl > inline ::com::sun::star::uno::Sequence< key > OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::getContainedTypes() const SAL_THROW( () ) { - typename CONT_HASHMAP::size_type nSize; - ::osl::MutexGuard aGuard( rMutex ); - if( nSize = m_pMap->size() ) + typename CONT_HASHMAP::size_type nSize = m_pMap->size(); + if( nSize != 0 ) { ::com::sun::star::uno::Sequence< key > aInterfaceTypes( nSize ); key * pArray = aInterfaceTypes.getArray(); @@ -84,7 +83,7 @@ inline ::com::sun::star::uno::Sequence< key > OMultiTypeInterfaceContainerHelper typename CONT_HASHMAP::iterator iter = m_pMap->begin(); typename CONT_HASHMAP::iterator end = m_pMap->end(); - sal_Int32 i = 0; + sal_uInt32 i = 0; while( iter != end ) { // are interfaces added to this container? @@ -163,7 +162,8 @@ void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::dispos OInterfaceContainerHelper ** ppListenerContainers = NULL; { ::osl::MutexGuard aGuard( rMutex ); - if( nSize = m_pMap->size() ) + nSize = m_pMap->size(); + if( nSize ) { typedef OInterfaceContainerHelper* ppp; ppListenerContainers = new ppp[nSize]; |