diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-10 16:43:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-11 12:38:32 +0200 |
| commit | d347c2403605c5aa3ddd98fb605366914acab79f (patch) | |
| tree | e39624030741234c514bccd858e69d6318dfba68 /connectivity/source/cpool | |
| parent | f0e68d4feaaa43f7450432ad1ebd92c2b572400f (diff) | |
convert std::map::insert to std::map::emplace
which is considerably less verbose
Change-Id: Ifa373e8eb09e39bd6c8d3578641610a6055a187b
Reviewed-on: https://gerrit.libreoffice.org/40978
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity/source/cpool')
| -rw-r--r-- | connectivity/source/cpool/ZConnectionPool.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/cpool/ZPoolCollection.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index 346f102e8401..cfa16ca44e2a 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -215,9 +215,9 @@ Reference< XConnection> OConnectionPool::createNewConnection(const OUString& _rU // insert the new connection and struct into the active connection map aPack.nALiveCount = m_nALiveCount; TActiveConnectionInfo aActiveInfo; - aActiveInfo.aPos = m_aPool.insert(TConnectionMap::value_type(nId,aPack)).first; + aActiveInfo.aPos = m_aPool.emplace(nId,aPack).first; aActiveInfo.xPooledConnection = xPooledConnection; - m_aActiveConnections.insert(TActiveConnectionMap::value_type(xConnection,aActiveInfo)); + m_aActiveConnections.emplace(xConnection,aActiveInfo); if(m_xInvalidator->isExpired()) m_xInvalidator->start(); diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 22ac35d02d9f..811be298bb07 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -305,7 +305,7 @@ OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName, if(xProp.is()) xProp->addPropertyChangeListener(getEnableNodeName(),this); OConnectionPool* pConnectionPool = new OConnectionPool(_xDriver,_xDriverNode,m_xProxyFactory); - aFind = m_aPools.insert(OConnectionPools::value_type(_sImplName,pConnectionPool)).first; + aFind = m_aPools.emplace(_sImplName,pConnectionPool).first; pRet = aFind->second.get(); } |