From f4e22a8968e3e783299f294dacf5f1c3a35e25ce Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Mon, 11 Mar 2013 03:58:27 -0700 Subject: [PATCH] Use emplace where we can. (On inserts into unordered maps.) --- src/cpp/ripple/NetworkOPs.cpp | 10 +++++----- src/cpp/ripple/SHAMap.cpp | 10 +++++----- src/cpp/ripple/Suppression.cpp | 2 +- src/cpp/ripple/ValidationCollection.cpp | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp index 40868a6f3..95cfdc217 100644 --- a/src/cpp/ripple/NetworkOPs.cpp +++ b/src/cpp/ripple/NetworkOPs.cpp @@ -1676,7 +1676,7 @@ bool NetworkOPs::subLedger(InfoSub::ref isrListener, Json::Value& jvResult) jvResult["validated_ledgers"] = theApp->getLedgerMaster().getCompleteLedgers(); boost::recursive_mutex::scoped_lock sl(mMonitorLock); - return mSubLedger.insert(std::make_pair(isrListener->getSeq(), isrListener)).second; + return mSubLedger.emplace(isrListener->getSeq(), isrListener).second; } // <-- bool: true=erased, false=was not there @@ -1704,7 +1704,7 @@ bool NetworkOPs::subServer(InfoSub::ref isrListener, Json::Value& jvResult) jvResult["load_factor"] = theApp->getFeeTrack().getLoadFactor(); boost::recursive_mutex::scoped_lock sl(mMonitorLock); - return mSubServer.insert(std::make_pair(isrListener->getSeq(), isrListener)).second; + return mSubServer.emplace(isrListener->getSeq(), isrListener).second; } // <-- bool: true=erased, false=was not there @@ -1718,7 +1718,7 @@ bool NetworkOPs::unsubServer(uint64 uSeq) bool NetworkOPs::subTransactions(InfoSub::ref isrListener) { boost::recursive_mutex::scoped_lock sl(mMonitorLock); - return mSubTransactions.insert(std::make_pair(isrListener->getSeq(), isrListener)).second; + return mSubTransactions.emplace(isrListener->getSeq(), isrListener).second; } // <-- bool: true=erased, false=was not there @@ -1732,7 +1732,7 @@ bool NetworkOPs::unsubTransactions(uint64 uSeq) bool NetworkOPs::subRTTransactions(InfoSub::ref isrListener) { boost::recursive_mutex::scoped_lock sl(mMonitorLock); - return mSubTransactions.insert(std::make_pair(isrListener->getSeq(), isrListener)).second; + return mSubTransactions.emplace(isrListener->getSeq(), isrListener).second; } // <-- bool: true=erased, false=was not there @@ -1756,7 +1756,7 @@ InfoSub::pointer NetworkOPs::addRpcSub(const std::string& strUrl, InfoSub::ref r { boost::recursive_mutex::scoped_lock sl(mMonitorLock); - mRpcSubMap.insert(std::make_pair(strUrl, rspEntry)); + mRpcSubMap.emplace(strUrl, rspEntry); return rspEntry; } diff --git a/src/cpp/ripple/SHAMap.cpp b/src/cpp/ripple/SHAMap.cpp index 38af55383..22995fdee 100644 --- a/src/cpp/ripple/SHAMap.cpp +++ b/src/cpp/ripple/SHAMap.cpp @@ -610,7 +610,7 @@ bool SHAMap::addGiveItem(SHAMapItem::ref item, bool isTransaction, bool hasMeta) assert(node->isEmptyBranch(branch)); SHAMapTreeNode::pointer newNode = boost::make_shared(node->getChildNodeID(branch), item, type, mSeq); - if (!mTNByID.insert(std::make_pair(SHAMapNode(*newNode), newNode)).second) + if (!mTNByID.emplace(SHAMapNode(*newNode), newNode).second) { std::cerr << "Node: " << *node << std::endl; std::cerr << "NewNode: " << *newNode << std::endl; @@ -643,7 +643,7 @@ bool SHAMap::addGiveItem(SHAMapItem::ref item, bool isTransaction, bool hasMeta) SHAMapTreeNode::pointer newNode = boost::make_shared(mSeq, node->getChildNodeID(b1)); newNode->makeInner(); - if (!mTNByID.insert(std::make_pair(SHAMapNode(*newNode), newNode)).second) + if (!mTNByID.emplace(SHAMapNode(*newNode), newNode).second) assert(false); stack.push(node); node = newNode; @@ -655,14 +655,14 @@ bool SHAMap::addGiveItem(SHAMapItem::ref item, bool isTransaction, bool hasMeta) SHAMapTreeNode::pointer newNode = boost::make_shared(node->getChildNodeID(b1), item, type, mSeq); assert(newNode->isValid() && newNode->isLeaf()); - if (!mTNByID.insert(std::make_pair(SHAMapNode(*newNode), newNode)).second) + if (!mTNByID.emplace(SHAMapNode(*newNode), newNode).second) assert(false); node->setChildHash(b1, newNode->getNodeHash()); // OPTIMIZEME hash op not needed trackNewNode(newNode); newNode = boost::make_shared(node->getChildNodeID(b2), otherItem, type, mSeq); assert(newNode->isValid() && newNode->isLeaf()); - if (!mTNByID.insert(std::make_pair(SHAMapNode(*newNode), newNode)).second) + if (!mTNByID.emplace(SHAMapNode(*newNode), newNode).second) assert(false); node->setChildHash(b2, newNode->getNodeHash()); trackNewNode(newNode); @@ -744,7 +744,7 @@ SHAMapTreeNode::pointer SHAMap::fetchNodeExternal(const SHAMapNode& id, const ui } if (id.isRoot()) mTNByID[id] = ret; - else if (!mTNByID.insert(std::make_pair(id, ret)).second) + else if (!mTNByID.emplace(id, ret).second) assert(false); trackNewNode(ret); return ret; diff --git a/src/cpp/ripple/Suppression.cpp b/src/cpp/ripple/Suppression.cpp index b168b9120..86f4c7d2a 100644 --- a/src/cpp/ripple/Suppression.cpp +++ b/src/cpp/ripple/Suppression.cpp @@ -30,7 +30,7 @@ Suppression& SuppressionTable::findCreateEntry(const uint256& index, bool& creat } mSuppressionTimes[now].push_back(index); - return mSuppressionMap.insert(std::make_pair(index, Suppression())).first->second; + return mSuppressionMap.emplace(index, Suppression()).first->second; } bool SuppressionTable::addSuppression(const uint256& index) diff --git a/src/cpp/ripple/ValidationCollection.cpp b/src/cpp/ripple/ValidationCollection.cpp index c67d1aa8b..6f10bcca9 100644 --- a/src/cpp/ripple/ValidationCollection.cpp +++ b/src/cpp/ripple/ValidationCollection.cpp @@ -66,7 +66,7 @@ bool ValidationCollection::addValidation(SerializedValidation::ref val) { boost::unordered_map::iterator it = mCurrentValidations.find(node); if (it == mCurrentValidations.end()) - mCurrentValidations.insert(std::make_pair(node, val)); + mCurrentValidations.emplace(node, val); else if (!it->second) it->second = val; else if (val->getSignTime() > it->second->getSignTime())