diff options
Diffstat (limited to 'connectivity/source/cpool')
-rw-r--r-- | connectivity/source/cpool/ZConnectionPool.cxx | 14 | ||||
-rw-r--r-- | connectivity/source/cpool/ZConnectionPool.hxx | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index a350993bd0e0..0e6be4f36039 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -77,8 +77,8 @@ OConnectionPool::~OConnectionPool() clear(false); } -struct TRemoveEventListenerFunctor : ::std::unary_function<TPooledConnections::value_type,void> - ,::std::unary_function<TActiveConnectionMap::value_type,void> +struct TRemoveEventListenerFunctor : std::unary_function<TPooledConnections::value_type,void> + ,std::unary_function<TActiveConnectionMap::value_type,void> { OConnectionPool* m_pConnectionPool; bool m_bDispose; @@ -113,7 +113,7 @@ struct TRemoveEventListenerFunctor : ::std::unary_function<TPooledConnections::v } }; -struct TConnectionPoolFunctor : ::std::unary_function<TConnectionMap::value_type,void> +struct TConnectionPoolFunctor : std::unary_function<TConnectionMap::value_type,void> { OConnectionPool* m_pConnectionPool; @@ -124,7 +124,7 @@ struct TConnectionPoolFunctor : ::std::unary_function<TConnectionMap::value_type } void operator()(const TConnectionMap::value_type& _aValue) { - ::std::for_each(_aValue.second.aConnections.begin(),_aValue.second.aConnections.end(),TRemoveEventListenerFunctor(m_pConnectionPool,true)); + std::for_each(_aValue.second.aConnections.begin(),_aValue.second.aConnections.end(),TRemoveEventListenerFunctor(m_pConnectionPool,true)); } }; @@ -135,10 +135,10 @@ void OConnectionPool::clear(bool _bDispose) if(m_xInvalidator->isTicking()) m_xInvalidator->stop(); - ::std::for_each(m_aPool.begin(),m_aPool.end(),TConnectionPoolFunctor(this)); + std::for_each(m_aPool.begin(),m_aPool.end(),TConnectionPoolFunctor(this)); m_aPool.clear(); - ::std::for_each(m_aActiveConnections.begin(),m_aActiveConnections.end(),TRemoveEventListenerFunctor(this,_bDispose)); + std::for_each(m_aActiveConnections.begin(),m_aActiveConnections.end(),TRemoveEventListenerFunctor(this,_bDispose)); m_aActiveConnections.clear(); Reference< XComponent > xComponent(m_xDriverNode, UNO_QUERY); @@ -235,7 +235,7 @@ void OConnectionPool::invalidatePooledConnections() { if(!(--(aIter->second.nALiveCount))) // connections are invalid { - ::std::for_each(aIter->second.aConnections.begin(),aIter->second.aConnections.end(),TRemoveEventListenerFunctor(this,true)); + std::for_each(aIter->second.aConnections.begin(),aIter->second.aConnections.end(),TRemoveEventListenerFunctor(this,true)); aIter->second.aConnections.clear(); diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx index 3430ee23c76c..890732848c90 100644 --- a/connectivity/source/cpool/ZConnectionPool.hxx +++ b/connectivity/source/cpool/ZConnectionPool.hxx @@ -62,7 +62,7 @@ namespace connectivity typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener> OConnectionPool_Base; // typedef for the internal structure - typedef ::std::vector< css::uno::Reference< css::sdbc::XPooledConnection> > TPooledConnections; + typedef std::vector< css::uno::Reference< css::sdbc::XPooledConnection> > TPooledConnections; // contains the currently pooled connections typedef struct @@ -83,7 +83,7 @@ namespace connectivity // typedef TDigestHolder - struct TDigestLess : public ::std::binary_function< TDigestHolder, TDigestHolder, bool> + struct TDigestLess : public std::binary_function< TDigestHolder, TDigestHolder, bool> { bool operator() (const TDigestHolder& x, const TDigestHolder& y) const { @@ -94,7 +94,7 @@ namespace connectivity } }; - typedef ::std::map< TDigestHolder,TConnectionPool,TDigestLess> TConnectionMap; + typedef std::map< TDigestHolder,TConnectionPool,TDigestLess> TConnectionMap; // contains additional information about a activeconnection which is needed to put it back to the pool typedef struct @@ -103,7 +103,7 @@ namespace connectivity css::uno::Reference< css::sdbc::XPooledConnection> xPooledConnection; } TActiveConnectionInfo; - typedef ::std::map< css::uno::Reference< css::sdbc::XConnection>, + typedef std::map< css::uno::Reference< css::sdbc::XConnection>, TActiveConnectionInfo> TActiveConnectionMap; class OConnectionPool : public OConnectionPool_Base |