diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-23 22:07:25 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-23 22:07:25 +0900 |
| commit | c0b60eb087ea47c0c9bd995b5398ed9f8edc907a (patch) | |
| tree | 0fbf04f1851d9f08db1b71dca8888510a8cb1d35 /src/BtSetup.cc | |
| parent | fa9f3fb5a3c8912a0a6880ffba9c72f4424ea044 (diff) | |
Use std::unique_ptr for UnionSeedCriteria
Diffstat (limited to 'src/BtSetup.cc')
| -rw-r--r-- | src/BtSetup.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/BtSetup.cc b/src/BtSetup.cc index f5a1467b..1edf22ea 100644 --- a/src/BtSetup.cc +++ b/src/BtSetup.cc @@ -156,27 +156,26 @@ void BtSetup::setup(std::vector<std::unique_ptr<Command>>& commands, } } if(!metadataGetMode) { - std::shared_ptr<UnionSeedCriteria> unionCri(new UnionSeedCriteria()); + auto unionCri = make_unique<UnionSeedCriteria>(); if(option->defined(PREF_SEED_TIME)) { - std::shared_ptr<SeedCriteria> cri - (new TimeSeedCriteria(option->getAsInt(PREF_SEED_TIME)*60)); - unionCri->addSeedCriteria(cri); + unionCri->addSeedCriteria(make_unique<TimeSeedCriteria> + (option->getAsInt(PREF_SEED_TIME)*60)); } { double ratio = option->getAsDouble(PREF_SEED_RATIO); if(ratio > 0.0) { - std::shared_ptr<ShareRatioSeedCriteria> cri - (new ShareRatioSeedCriteria(option->getAsDouble(PREF_SEED_RATIO), - requestGroup->getDownloadContext())); + auto cri = make_unique<ShareRatioSeedCriteria> + (option->getAsDouble(PREF_SEED_RATIO), + requestGroup->getDownloadContext()); cri->setPieceStorage(pieceStorage); cri->setBtRuntime(btRuntime); - unionCri->addSeedCriteria(cri); + unionCri->addSeedCriteria(std::move(cri)); } } if(!unionCri->getSeedCriterion().empty()) { auto c = make_unique<SeedCheckCommand> - (e->newCUID(), requestGroup, e, unionCri); + (e->newCUID(), requestGroup, e, std::move(unionCri)); c->setPieceStorage(pieceStorage); c->setBtRuntime(btRuntime); commands.push_back(std::move(c)); |
