summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-02-15 23:55:18 +0200
committerTor Lillqvist <tml@collabora.com>2017-02-15 23:01:23 +0000
commit6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4 (patch)
tree3f669db44367a2a072b899a1a1b87eb25ee607af /cppuhelper
parent3e1e49561bb734475d2b7d1db1beef0d3e9b53cd (diff)
Drop :: prefix from std in c*/
Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155 Reviewed-on: https://gerrit.libreoffice.org/34324 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/source/component_context.cxx2
-rw-r--r--cppuhelper/source/factory.cxx2
-rw-r--r--cppuhelper/source/interfacecontainer.cxx4
-rw-r--r--cppuhelper/source/propshlp.cxx24
4 files changed, 16 insertions, 16 deletions
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<t_map::iterator, bool> insertion( m_map.insert(
+ std::pair<t_map::iterator, bool> 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<XSingleComponentFactory > xModuleFactory;
Reference<XSingleServiceFactory > 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();