github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Use std::unique_ptr for StreamPieceSelector instead of std::shared_ptr

pull/103/head
Tatsuhiro Tsujikawa 2013-07-04 01:41:12 +09:00
parent 128783cf86
commit bc6aa3073b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/DefaultPieceStorage.cc
View File

@ -89,11 +89,14 @@ DefaultPieceStorage::DefaultPieceStorage
const std::string& pieceSelectorOpt = const std::string& pieceSelectorOpt =
option_->get(PREF_STREAM_PIECE_SELECTOR); option_->get(PREF_STREAM_PIECE_SELECTOR);
if(pieceSelectorOpt.empty() || pieceSelectorOpt == A2_V_DEFAULT) { if(pieceSelectorOpt.empty() || pieceSelectorOpt == A2_V_DEFAULT) {
streamPieceSelector_.reset(new DefaultStreamPieceSelector(bitfieldMan_)); streamPieceSelector_ = make_unique<DefaultStreamPieceSelector>
(bitfieldMan_);
} else if(pieceSelectorOpt == V_INORDER) { } else if(pieceSelectorOpt == V_INORDER) {
streamPieceSelector_.reset(new InorderStreamPieceSelector(bitfieldMan_)); streamPieceSelector_ = make_unique<InorderStreamPieceSelector>
(bitfieldMan_);
} else if(pieceSelectorOpt == A2_V_GEOM) { } else if(pieceSelectorOpt == A2_V_GEOM) {
streamPieceSelector_.reset(new GeomStreamPieceSelector(bitfieldMan_, 1.5)); streamPieceSelector_ = make_unique<GeomStreamPieceSelector>
(bitfieldMan_, 1.5);
} }
} }

2
src/DefaultPieceStorage.h
View File

@ -91,7 +91,7 @@ private:
std::shared_ptr<PieceStatMan> pieceStatMan_; std::shared_ptr<PieceStatMan> pieceStatMan_;
std::unique_ptr<PieceSelector> pieceSelector_; std::unique_ptr<PieceSelector> pieceSelector_;
std::shared_ptr<StreamPieceSelector> streamPieceSelector_; std::unique_ptr<StreamPieceSelector> streamPieceSelector_;
WrDiskCache* wrDiskCache_; WrDiskCache* wrDiskCache_;
#ifdef ENABLE_BITTORRENT #ifdef ENABLE_BITTORRENT