From 6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 15 Feb 2017 23:55:18 +0200 Subject: Drop :: prefix from std in c*/ Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155 Reviewed-on: https://gerrit.libreoffice.org/34324 Tested-by: Jenkins Reviewed-by: Tor Lillqvist --- cppuhelper/source/component_context.cxx | 2 +- cppuhelper/source/factory.cxx | 2 +- cppuhelper/source/interfacecontainer.cxx | 4 ++-- cppuhelper/source/propshlp.cxx | 24 ++++++++++++------------ 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'cppuhelper') diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index 8bc46d9281ef..3311770281e6 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -185,7 +185,7 @@ void ComponentContext::insertByName( name.startsWith( "/singletons/" ) && !element.hasValue() ) ); MutexGuard guard( m_mutex ); - ::std::pair insertion( m_map.insert( + std::pair insertion( m_map.insert( t_map::value_type( name, entry ) ) ); if (! insertion.second) throw container::ElementExistException( diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 4bf015d83f51..4c55ad7aaf91 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -497,7 +497,7 @@ private: Reference xModuleFactory; Reference xModuleFactoryDepr; Reference< beans::XPropertySetInfo > m_xInfo; - ::std::unique_ptr< IPropertyArrayHelper > m_property_array_helper; + std::unique_ptr< IPropertyArrayHelper > m_property_array_helper; protected: using OPropertySetHelper::getTypes; }; diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx index ae19aad49c74..a2f7d7e46e76 100644 --- a/cppuhelper/source/interfacecontainer.cxx +++ b/cppuhelper/source/interfacecontainer.cxx @@ -330,7 +330,7 @@ void OInterfaceContainerHelper::clear() // specialized class for type -typedef ::std::vector< std::pair < Type , void* > > t_type2ptr; +typedef std::vector< std::pair < Type , void* > > t_type2ptr; OMultiTypeInterfaceContainerHelper::OMultiTypeInterfaceContainerHelper( Mutex & rMutex_ ) : rMutex( rMutex_ ) @@ -494,7 +494,7 @@ void OMultiTypeInterfaceContainerHelper::clear() // specialized class for long -typedef ::std::vector< std::pair < sal_Int32 , void* > > t_long2ptr; +typedef std::vector< std::pair < sal_Int32 , void* > > t_long2ptr; static t_long2ptr::iterator findLong(t_long2ptr *pMap, sal_Int32 nKey ) { diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index bb375dd2a42c..bc758f95cfc5 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -149,9 +149,9 @@ public: bool m_bFireEvents; class IEventNotificationHook * const m_pFireEvents; - ::std::vector< sal_Int32 > m_handles; - ::std::vector< Any > m_newValues; - ::std::vector< Any > m_oldValues; + std::vector< sal_Int32 > m_handles; + std::vector< Any > m_newValues; + std::vector< Any > m_oldValues; }; @@ -577,17 +577,17 @@ void OPropertySetHelper::impl_fireAll( sal_Int32* i_handles, const Any* i_newVal && additionalEvents == m_pReserved->m_oldValues.size(), "OPropertySetHelper::impl_fireAll: inconsistency!" ); - ::std::vector< sal_Int32 > allHandles( additionalEvents + i_count ); - ::std::copy( m_pReserved->m_handles.begin(), m_pReserved->m_handles.end(), allHandles.begin() ); - ::std::copy( i_handles, i_handles + i_count, allHandles.begin() + additionalEvents ); + std::vector< sal_Int32 > allHandles( additionalEvents + i_count ); + std::copy( m_pReserved->m_handles.begin(), m_pReserved->m_handles.end(), allHandles.begin() ); + std::copy( i_handles, i_handles + i_count, allHandles.begin() + additionalEvents ); - ::std::vector< Any > allNewValues( additionalEvents + i_count ); - ::std::copy( m_pReserved->m_newValues.begin(), m_pReserved->m_newValues.end(), allNewValues.begin() ); - ::std::copy( i_newValues, i_newValues + i_count, allNewValues.begin() + additionalEvents ); + std::vector< Any > allNewValues( additionalEvents + i_count ); + std::copy( m_pReserved->m_newValues.begin(), m_pReserved->m_newValues.end(), allNewValues.begin() ); + std::copy( i_newValues, i_newValues + i_count, allNewValues.begin() + additionalEvents ); - ::std::vector< Any > allOldValues( additionalEvents + i_count ); - ::std::copy( m_pReserved->m_oldValues.begin(), m_pReserved->m_oldValues.end(), allOldValues.begin() ); - ::std::copy( i_oldValues, i_oldValues + i_count, allOldValues.begin() + additionalEvents ); + std::vector< Any > allOldValues( additionalEvents + i_count ); + std::copy( m_pReserved->m_oldValues.begin(), m_pReserved->m_oldValues.end(), allOldValues.begin() ); + std::copy( i_oldValues, i_oldValues + i_count, allOldValues.begin() + additionalEvents ); m_pReserved->m_handles.clear(); m_pReserved->m_newValues.clear(); -- cgit