From bc6aa3073b3584c63dff4f08cdbb7656ce23eff9 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 4 Jul 2013 01:41:12 +0900 Subject: Use std::unique_ptr for StreamPieceSelector instead of std::shared_ptr --- src/DefaultPieceStorage.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/DefaultPieceStorage.cc') 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 + (bitfieldMan_); } else if(pieceSelectorOpt == V_INORDER) { - streamPieceSelector_.reset(new InorderStreamPieceSelector(bitfieldMan_)); + streamPieceSelector_ = make_unique + (bitfieldMan_); } else if(pieceSelectorOpt == A2_V_GEOM) { - streamPieceSelector_.reset(new GeomStreamPieceSelector(bitfieldMan_, 1.5)); + streamPieceSelector_ = make_unique + (bitfieldMan_, 1.5); } } -- cgit