From 6394ca23411fa65d608f41ba42e07469f2ff0898 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Fri, 2 Nov 2012 09:00:29 -0700 Subject: [PATCH] x = y::pointer() -> x.reset() --- src/ConnectionPool.cpp | 6 +++--- src/Ledger.cpp | 5 +++-- src/LedgerAcquire.cpp | 2 +- src/LedgerConsensus.cpp | 2 +- src/LedgerMaster.cpp | 6 +++--- src/NetworkOPs.cpp | 4 ++-- src/Peer.cpp | 2 +- src/SHAMapDiff.cpp | 2 +- src/SHAMapNodes.cpp | 2 +- src/TransactionEngine.cpp | 2 +- src/ValidationCollection.cpp | 2 +- 11 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/ConnectionPool.cpp b/src/ConnectionPool.cpp index 6b01a1439..93fce5842 100644 --- a/src/ConnectionPool.cpp +++ b/src/ConnectionPool.cpp @@ -304,7 +304,7 @@ void ConnectionPool::connectTo(const std::string& strIp, int iPort) Peer::pointer ConnectionPool::peerConnect(const std::string& strIp, int iPort) { ipPort pipPeer = make_pair(strIp, iPort); - Peer::pointer ppResult = Peer::pointer(); + Peer::pointer ppResult; boost::unordered_map::iterator it; @@ -545,7 +545,7 @@ void ConnectionPool::peerClosed(Peer::ref peer, const std::string& strIp, int iP { //cLog(lsINFO) << "Pool: Scan: scan fail: " << strIp << " " << iPort; - mScanning = Peer::pointer(); // No longer scanning. + mScanning.reset(); // No longer scanning. bScanRefresh = true; // Look for more to scan. } @@ -619,7 +619,7 @@ void ConnectionPool::peerVerified(Peer::ref peer) // XXX Check error. } - mScanning = Peer::pointer(); + mScanning.reset(); scanRefresh(); // Continue scanning. } diff --git a/src/Ledger.cpp b/src/Ledger.cpp index ec44a5dc9..f05e1245a 100644 --- a/src/Ledger.cpp +++ b/src/Ledger.cpp @@ -190,7 +190,8 @@ AccountState::pointer Ledger::getAccountState(const RippleAddress& accountID) } SerializedLedgerEntry::pointer sle = boost::make_shared(item->peekSerializer(), item->getTag()); - if (sle->getType() != ltACCOUNT_ROOT) return AccountState::pointer(); + if (sle->getType() != ltACCOUNT_ROOT) + return AccountState::pointer(); return boost::make_shared(sle,accountID); } @@ -308,7 +309,7 @@ bool Ledger::getTransaction(const uint256& txID, Transaction::pointer& txn, Tran if (type == SHAMapTreeNode::tnTRANSACTION_NM) { // in tree with no metadata txn = theApp->getMasterTransaction().fetch(txID, false); - meta = TransactionMetaSet::pointer(); + meta.reset(); if (!txn) txn = Transaction::sharedTransaction(item->peekData(), true); } diff --git a/src/LedgerAcquire.cpp b/src/LedgerAcquire.cpp index a9c4cf8ca..f9d9f1bef 100644 --- a/src/LedgerAcquire.cpp +++ b/src/LedgerAcquire.cpp @@ -407,7 +407,7 @@ bool LedgerAcquire::takeBase(const std::string& data) { cLog(lsWARNING) << "Acquire hash mismatch"; cLog(lsWARNING) << mLedger->getHash() << "!=" << mHash; - mLedger = Ledger::pointer(); + mLedger.reset(); #ifdef TRUST_NETWORK assert(false); #endif diff --git a/src/LedgerConsensus.cpp b/src/LedgerConsensus.cpp index 15e439784..876a14cc6 100644 --- a/src/LedgerConsensus.cpp +++ b/src/LedgerConsensus.cpp @@ -347,7 +347,7 @@ void LedgerConsensus::handleLCL(const uint256& lclHash) cLog(lsINFO) << "Have the consensus ledger " << mPrevLedgerHash; mHaveCorrectLCL = true; - mAcquiringLedger = LedgerAcquire::pointer(); + mAcquiringLedger.reset(); theApp->getOPs().clearNeedNetworkLedger(); mCloseResolution = ContinuousLedgerTiming::getNextLedgerTimeResolution( mPreviousLedger->getCloseResolution(), mPreviousLedger->getCloseAgree(), diff --git a/src/LedgerMaster.cpp b/src/LedgerMaster.cpp index d83c72bf8..cd477b21c 100644 --- a/src/LedgerMaster.cpp +++ b/src/LedgerMaster.cpp @@ -103,7 +103,7 @@ void LedgerMaster::acquireMissingLedger(const uint256& ledgerHash, uint32 ledger Ledger::pointer lgr = mMissingLedger->getLedger(); if (lgr && (lgr->getLedgerSeq() == ledgerSeq)) missingAcquireComplete(mMissingLedger); - mMissingLedger = LedgerAcquire::pointer(); + mMissingLedger.reset(); return; } mMissingSeq = ledgerSeq; @@ -120,7 +120,7 @@ void LedgerMaster::missingAcquireComplete(LedgerAcquire::pointer acq) cLog(lsWARNING) << "Acquire failed for " << mMissingSeq; } - mMissingLedger = LedgerAcquire::pointer(); + mMissingLedger.reset(); mMissingSeq = 0; if (!acq->isFailed()) @@ -147,7 +147,7 @@ void LedgerMaster::setFullLedger(Ledger::ref ledger) } if (mMissingLedger && mMissingLedger->isComplete()) - mMissingLedger = LedgerAcquire::pointer(); + mMissingLedger.reset(); if (mMissingLedger || !theConfig.FULL_HISTORY) return; diff --git a/src/NetworkOPs.cpp b/src/NetworkOPs.cpp index 966570be6..ce52fde7b 100644 --- a/src/NetworkOPs.cpp +++ b/src/NetworkOPs.cpp @@ -106,7 +106,7 @@ Transaction::pointer NetworkOPs::submitTransaction(const Transaction::pointer& t assert(false); - tpTransNew = Transaction::pointer(); + tpTransNew.reset(); } return tpTransNew; @@ -571,7 +571,7 @@ bool NetworkOPs::checkLastClosedLedger(const std::vector& peerLis { mAcquiringLedger->abort(); theApp->getMasterLedgerAcquire().dropLedger(mAcquiringLedger->getHash()); - mAcquiringLedger = LedgerAcquire::pointer(); + mAcquiringLedger.reset(); } return false; } diff --git a/src/Peer.cpp b/src/Peer.cpp index 83f8f62ad..c9c6df5db 100644 --- a/src/Peer.cpp +++ b/src/Peer.cpp @@ -41,7 +41,7 @@ void Peer::handle_write(const boost::system::error_code& error, size_t bytes_tra // std::cerr << "Peer::handle_write bytes: "<< bytes_transferred << std::endl; #endif - mSendingPacket = PackedMessage::pointer(); + mSendingPacket.reset(); if (mDetaching) { diff --git a/src/SHAMapDiff.cpp b/src/SHAMapDiff.cpp index 05619df21..dd47b8375 100644 --- a/src/SHAMapDiff.cpp +++ b/src/SHAMapDiff.cpp @@ -73,7 +73,7 @@ bool SHAMap::walkBranch(SHAMapTreeNode* node, SHAMapItem::ref otherMapItem, bool else differences.insert(std::make_pair(otherMapItem->getTag(), std::make_pair(otherMapItem, item))); if(--maxCount <= 0) return false; - item = SHAMapItem::pointer(); + item.reset(); } } else assert(false); diff --git a/src/SHAMapNodes.cpp b/src/SHAMapNodes.cpp index 9db9f4e2c..0d4f134c4 100644 --- a/src/SHAMapNodes.cpp +++ b/src/SHAMapNodes.cpp @@ -500,7 +500,7 @@ int SHAMapTreeNode::getBranchCount() const void SHAMapTreeNode::makeInner() { - mItem = SHAMapItem::pointer(); + mItem.reset(); memset(mHashes, 0, sizeof(mHashes)); mType = tnINNER; mHash.zero(); diff --git a/src/TransactionEngine.cpp b/src/TransactionEngine.cpp index 0b29d4e85..053502939 100644 --- a/src/TransactionEngine.cpp +++ b/src/TransactionEngine.cpp @@ -481,7 +481,7 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa } } - mTxnAccount = SLE::pointer(); + mTxnAccount.reset(); mNodes.clear(); if (!isSetBit(params, tapOPEN_LEDGER) diff --git a/src/ValidationCollection.cpp b/src/ValidationCollection.cpp index a66ca7edf..f4c7b941b 100644 --- a/src/ValidationCollection.cpp +++ b/src/ValidationCollection.cpp @@ -184,7 +184,7 @@ ValidationCollection::getCurrentValidations(uint256 currentLedger) else if (it->second->getSignTime() < cutoff) { // contains a stale record mStaleValidations.push_back(it->second); - it->second = SerializedValidation::pointer(); + it->second.reset(); condWrite(); it = mCurrentValidations.erase(it); }