Index: inc/cppuhelper/interfacecontainer.hxx =================================================================== RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/interfacecontainer.hxx,v retrieving revision 1.3 diff -u -b -B -p -r1.3 interfacecontainer.hxx --- inc/cppuhelper/interfacecontainer.hxx 7 Jun 2001 11:11:28 -0000 1.3 +++ inc/cppuhelper/interfacecontainer.hxx 24 Feb 2003 12:19:39 -0000 @@ -82,8 +82,8 @@ template< class key , class hashImpl , c inline OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::~OMultiTypeInterfaceContainerHelperVar() SAL_THROW( () ) { - CONT_HASHMAP::iterator iter = m_pMap->begin(); - CONT_HASHMAP::iterator end = m_pMap->end(); + typename CONT_HASHMAP::iterator iter = m_pMap->begin(); + typename CONT_HASHMAP::iterator end = m_pMap->end(); while( iter != end ) { @@ -99,7 +99,7 @@ template< class key , class hashImpl , c inline ::com::sun::star::uno::Sequence< key > OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::getContainedTypes() const SAL_THROW( () ) { - CONT_HASHMAP::size_type nSize; + typename CONT_HASHMAP::size_type nSize; ::osl::MutexGuard aGuard( rMutex ); if( nSize = m_pMap->size() ) @@ -107,8 +107,8 @@ inline ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< key > aInterfaceTypes( nSize ); key * pArray = aInterfaceTypes.getArray(); - CONT_HASHMAP::iterator iter = m_pMap->begin(); - CONT_HASHMAP::iterator end = m_pMap->end(); + typename CONT_HASHMAP::iterator iter = m_pMap->begin(); + typename CONT_HASHMAP::iterator end = m_pMap->end(); sal_Int32 i = 0; while( iter != end ) @@ -135,7 +135,7 @@ OInterfaceContainerHelper * OMultiTypeIn { ::osl::MutexGuard aGuard( rMutex ); - CONT_HASHMAP::iterator iter = m_pMap->find( rKey ); + typename CONT_HASHMAP::iterator iter = m_pMap->find( rKey ); if( iter != m_pMap->end() ) return (OInterfaceContainerHelper*) (*iter).second; return 0; @@ -149,7 +149,7 @@ sal_Int32 OMultiTypeInterfaceContainerHe SAL_THROW( () ) { ::osl::MutexGuard aGuard( rMutex ); - CONT_HASHMAP::iterator + typename CONT_HASHMAP::iterator iter = m_pMap->find( rKey ); if( iter == m_pMap->end() ) { @@ -171,7 +171,7 @@ inline sal_Int32 OMultiTypeInterfaceCont ::osl::MutexGuard aGuard( rMutex ); // search container with id nUik - CONT_HASHMAP::iterator iter = m_pMap->find( rKey ); + typename CONT_HASHMAP::iterator iter = m_pMap->find( rKey ); // container found? if( iter != m_pMap->end() ) return ((OInterfaceContainerHelper*)(*iter).second)->removeInterface( rListener ); @@ -186,7 +186,7 @@ void OMultiTypeInterfaceContainerHelperV const ::com::sun::star::lang::EventObject & rEvt ) SAL_THROW( () ) { - CONT_HASHMAP::size_type nSize = 0; + typename CONT_HASHMAP::size_type nSize = 0; OInterfaceContainerHelper ** ppListenerContainers = NULL; { ::osl::MutexGuard aGuard( rMutex ); @@ -196,10 +196,10 @@ void OMultiTypeInterfaceContainerHelperV ppListenerContainers = new ppp[nSize]; //ppListenerContainers = new (ListenerContainer*)[nSize]; - CONT_HASHMAP::iterator iter = m_pMap->begin(); - CONT_HASHMAP::iterator end = m_pMap->end(); + typename CONT_HASHMAP::iterator iter = m_pMap->begin(); + typename CONT_HASHMAP::iterator end = m_pMap->end(); - CONT_HASHMAP::size_type i = 0; + typename CONT_HASHMAP::size_type i = 0; while( iter != end ) { ppListenerContainers[i++] = (OInterfaceContainerHelper*)(*iter).second; @@ -209,7 +209,7 @@ void OMultiTypeInterfaceContainerHelperV } // create a copy, because do not fire event in a guarded section - for( CONT_HASHMAP::size_type i = 0; + for( typename CONT_HASHMAP::size_type i = 0; i < nSize; i++ ) { if( ppListenerContainers[i] ) @@ -224,8 +224,8 @@ template< class key , class hashImpl , c void OMultiTypeInterfaceContainerHelperVar< key , hashImpl , equalImpl >::clear() SAL_THROW( () ) { ::osl::MutexGuard aGuard( rMutex ); - CONT_HASHMAP::iterator iter = m_pMap->begin(); - CONT_HASHMAP::iterator end = m_pMap->end(); + typename CONT_HASHMAP::iterator iter = m_pMap->begin(); + typename CONT_HASHMAP::iterator end = m_pMap->end(); while( iter != end ) {