diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-07-04 01:41:12 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-07-04 01:41:12 +0900 |
| commit | bc6aa3073b3584c63dff4f08cdbb7656ce23eff9 (patch) | |
| tree | bb5718410bfa2244bfdc13b940b446a0518941cf /src | |
| parent | 128783cf8636bb713f29e472b11444c2b9287d8d (diff) | |
Use std::unique_ptr for StreamPieceSelector instead of std::shared_ptr
Diffstat (limited to 'src')
| -rw-r--r-- | src/DefaultPieceStorage.cc | 9 | ||||
| -rw-r--r-- | src/DefaultPieceStorage.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/DefaultPieceStorage.cc b/src/DefaultPieceStorage.cc index 8a236e59..a179091b 100644 --- a/src/DefaultPieceStorage.cc +++ b/src/DefaultPieceStorage.cc @@ -89,11 +89,14 @@ DefaultPieceStorage::DefaultPieceStorage const std::string& pieceSelectorOpt = option_->get(PREF_STREAM_PIECE_SELECTOR); if(pieceSelectorOpt.empty() || pieceSelectorOpt == A2_V_DEFAULT) { - streamPieceSelector_.reset(new DefaultStreamPieceSelector(bitfieldMan_)); + streamPieceSelector_ = make_unique<DefaultStreamPieceSelector> + (bitfieldMan_); } else if(pieceSelectorOpt == V_INORDER) { - streamPieceSelector_.reset(new InorderStreamPieceSelector(bitfieldMan_)); + streamPieceSelector_ = make_unique<InorderStreamPieceSelector> + (bitfieldMan_); } else if(pieceSelectorOpt == A2_V_GEOM) { - streamPieceSelector_.reset(new GeomStreamPieceSelector(bitfieldMan_, 1.5)); + streamPieceSelector_ = make_unique<GeomStreamPieceSelector> + (bitfieldMan_, 1.5); } } diff --git a/src/DefaultPieceStorage.h b/src/DefaultPieceStorage.h index d6094d2e..e79cc1d7 100644 --- a/src/DefaultPieceStorage.h +++ b/src/DefaultPieceStorage.h @@ -91,7 +91,7 @@ private: std::shared_ptr<PieceStatMan> pieceStatMan_; std::unique_ptr<PieceSelector> pieceSelector_; - std::shared_ptr<StreamPieceSelector> streamPieceSelector_; + std::unique_ptr<StreamPieceSelector> streamPieceSelector_; WrDiskCache* wrDiskCache_; #ifdef ENABLE_BITTORRENT |