|
@@ -50,15 +50,15 @@ namespace aria2 {
|
|
UnknownLengthPieceStorage::UnknownLengthPieceStorage
|
|
UnknownLengthPieceStorage::UnknownLengthPieceStorage
|
|
(const std::shared_ptr<DownloadContext>& downloadContext)
|
|
(const std::shared_ptr<DownloadContext>& downloadContext)
|
|
: downloadContext_(downloadContext),
|
|
: downloadContext_(downloadContext),
|
|
- diskWriterFactory_(new DefaultDiskWriterFactory()),
|
|
|
|
- totalLength_(0),
|
|
|
|
- downloadFinished_(false) {}
|
|
|
|
|
|
+ diskWriterFactory_(std::make_shared<DefaultDiskWriterFactory>()),
|
|
|
|
+ totalLength_(0),
|
|
|
|
+ downloadFinished_(false) {}
|
|
|
|
|
|
UnknownLengthPieceStorage::~UnknownLengthPieceStorage() {}
|
|
UnknownLengthPieceStorage::~UnknownLengthPieceStorage() {}
|
|
|
|
|
|
void UnknownLengthPieceStorage::initStorage()
|
|
void UnknownLengthPieceStorage::initStorage()
|
|
{
|
|
{
|
|
- auto directDiskAdaptor(new DirectDiskAdaptor());
|
|
|
|
|
|
+ auto directDiskAdaptor = std::make_shared<DirectDiskAdaptor>();
|
|
directDiskAdaptor->setTotalLength(downloadContext_->getTotalLength());
|
|
directDiskAdaptor->setTotalLength(downloadContext_->getTotalLength());
|
|
directDiskAdaptor->setFileEntries(downloadContext_->getFileEntries().begin(),
|
|
directDiskAdaptor->setFileEntries(downloadContext_->getFileEntries().begin(),
|
|
downloadContext_->getFileEntries().end());
|
|
downloadContext_->getFileEntries().end());
|
|
@@ -66,7 +66,7 @@ void UnknownLengthPieceStorage::initStorage()
|
|
directDiskAdaptor->setDiskWriter
|
|
directDiskAdaptor->setDiskWriter
|
|
(diskWriterFactory_->newDiskWriter(directDiskAdaptor->getFilePath()));
|
|
(diskWriterFactory_->newDiskWriter(directDiskAdaptor->getFilePath()));
|
|
|
|
|
|
- diskAdaptor_.reset(directDiskAdaptor);
|
|
|
|
|
|
+ diskAdaptor_ = std::move(directDiskAdaptor);
|
|
}
|
|
}
|
|
|
|
|
|
#ifdef ENABLE_BITTORRENT
|
|
#ifdef ENABLE_BITTORRENT
|
|
@@ -145,7 +145,7 @@ std::shared_ptr<Piece> UnknownLengthPieceStorage::getMissingPiece
|
|
return nullptr;
|
|
return nullptr;
|
|
}
|
|
}
|
|
if(!piece_) {
|
|
if(!piece_) {
|
|
- piece_.reset(new Piece());
|
|
|
|
|
|
+ piece_ = std::make_shared<Piece>();
|
|
return piece_;
|
|
return piece_;
|
|
} else {
|
|
} else {
|
|
return nullptr;
|
|
return nullptr;
|
|
@@ -167,7 +167,7 @@ std::shared_ptr<Piece> UnknownLengthPieceStorage::getPiece(size_t index)
|
|
{
|
|
{
|
|
if(index == 0) {
|
|
if(index == 0) {
|
|
if(!piece_) {
|
|
if(!piece_) {
|
|
- return std::shared_ptr<Piece>(new Piece());
|
|
|
|
|
|
+ return std::make_shared<Piece>();
|
|
} else {
|
|
} else {
|
|
return piece_;
|
|
return piece_;
|
|
}
|
|
}
|