diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-30 16:55:15 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-30 22:55:43 +0900 |
| commit | 098f1571be6f9d30d394eb83d35cc67f8e9ebcb0 (patch) | |
| tree | 1fd7ae9d1173704f39291c5f438c3388a3ab3d65 /src/BtRequestMessage.cc | |
| parent | abcb0745ed3c60f17942ce65fb63159a157854ea (diff) | |
Wrap BtMessage objects by std::unique_ptr instead of std::shared_ptr
Diffstat (limited to 'src/BtRequestMessage.cc')
| -rw-r--r-- | src/BtRequestMessage.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/BtRequestMessage.cc b/src/BtRequestMessage.cc index 31ddc8a9..19ed7743 100644 --- a/src/BtRequestMessage.cc +++ b/src/BtRequestMessage.cc @@ -38,6 +38,8 @@ #include "PieceStorage.h" #include "BtMessageDispatcher.h" #include "BtMessageFactory.h" +#include "BtPieceMessage.h" +#include "BtRejectMessage.h" namespace aria2 { @@ -48,7 +50,7 @@ BtRequestMessage::BtRequestMessage RangeBtMessage(ID, NAME, index, begin, length), blockIndex_(blockIndex) {} -BtRequestMessage* BtRequestMessage::create +std::unique_ptr<BtRequestMessage> BtRequestMessage::create (const unsigned char* data, size_t dataLength) { return RangeBtMessage::create<BtRequestMessage>(data, dataLength); @@ -63,16 +65,14 @@ void BtRequestMessage::doReceivedAction() (!getPeer()->amChoking() || (getPeer()->amChoking() && getPeer()->isInAmAllowedIndexSet(getIndex())))) { - std::shared_ptr<BtMessage> msg = - getBtMessageFactory()->createPieceMessage - (getIndex(), getBegin(), getLength()); - getBtMessageDispatcher()->addMessageToQueue(msg); + getBtMessageDispatcher()->addMessageToQueue + (getBtMessageFactory()->createPieceMessage + (getIndex(), getBegin(), getLength())); } else { if(getPeer()->isFastExtensionEnabled()) { - std::shared_ptr<BtMessage> msg = - getBtMessageFactory()->createRejectMessage - (getIndex(), getBegin(), getLength()); - getBtMessageDispatcher()->addMessageToQueue(msg); + getBtMessageDispatcher()->addMessageToQueue + (getBtMessageFactory()->createRejectMessage + (getIndex(), getBegin(), getLength())); } } } |
