diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
| commit | 07d270c87e6f9184aea4ca17eb26e466712e8db2 (patch) | |
| tree | 2dfbaa2e0d2ad0f38cb73098608f7d67a64320f8 /src/InitiatorMSEHandshakeCommand.cc | |
| parent | 126a4bde612eb0e6c48cf2f13ebe3eac45cc71a8 (diff) | |
Require -std=c++11 and use std::shared_ptr instead of SharedHandle
Diffstat (limited to 'src/InitiatorMSEHandshakeCommand.cc')
| -rw-r--r-- | src/InitiatorMSEHandshakeCommand.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/InitiatorMSEHandshakeCommand.cc b/src/InitiatorMSEHandshakeCommand.cc index 65b6c437..e5022921 100644 --- a/src/InitiatorMSEHandshakeCommand.cc +++ b/src/InitiatorMSEHandshakeCommand.cc @@ -62,10 +62,10 @@ namespace aria2 { InitiatorMSEHandshakeCommand::InitiatorMSEHandshakeCommand (cuid_t cuid, RequestGroup* requestGroup, - const SharedHandle<Peer>& p, + const std::shared_ptr<Peer>& p, DownloadEngine* e, - const SharedHandle<BtRuntime>& btRuntime, - const SharedHandle<SocketCore>& s) + const std::shared_ptr<BtRuntime>& btRuntime, + const std::shared_ptr<SocketCore>& s) : PeerAbstractCommand(cuid, p, e, s), requestGroup_(requestGroup), btRuntime_(btRuntime), @@ -149,7 +149,7 @@ bool InitiatorMSEHandshakeCommand::executeInternal() { } case INITIATOR_RECEIVE_PAD_D: { if(mseHandshake_->receivePad()) { - SharedHandle<PeerConnection> peerConnection + std::shared_ptr<PeerConnection> peerConnection (new PeerConnection(getCuid(), getPeer(), getSocket())); if(mseHandshake_->getNegotiatedCryptoType() == MSEHandshake::CRYPTO_ARC4){ @@ -199,7 +199,7 @@ void InitiatorMSEHandshakeCommand::tryNewPeer() { if(peerStorage_->isPeerAvailable() && btRuntime_->lessThanEqMinPeers()) { cuid_t ncuid = getDownloadEngine()->newCUID(); - SharedHandle<Peer> peer = peerStorage_->checkoutPeer(ncuid); + std::shared_ptr<Peer> peer = peerStorage_->checkoutPeer(ncuid); // sanity check if(peer) { PeerInitiateConnectionCommand* command; @@ -254,18 +254,18 @@ bool InitiatorMSEHandshakeCommand::exitBeforeExecute() } void InitiatorMSEHandshakeCommand::setPeerStorage -(const SharedHandle<PeerStorage>& peerStorage) +(const std::shared_ptr<PeerStorage>& peerStorage) { peerStorage_ = peerStorage; } void InitiatorMSEHandshakeCommand::setPieceStorage -(const SharedHandle<PieceStorage>& pieceStorage) +(const std::shared_ptr<PieceStorage>& pieceStorage) { pieceStorage_ = pieceStorage; } -const SharedHandle<Option>& InitiatorMSEHandshakeCommand::getOption() const +const std::shared_ptr<Option>& InitiatorMSEHandshakeCommand::getOption() const { return requestGroup_->getOption(); } |
