diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
| commit | 07d270c87e6f9184aea4ca17eb26e466712e8db2 (patch) | |
| tree | 2dfbaa2e0d2ad0f38cb73098608f7d67a64320f8 /src/MetalinkPostDownloadHandler.cc | |
| parent | 126a4bde612eb0e6c48cf2f13ebe3eac45cc71a8 (diff) | |
Require -std=c++11 and use std::shared_ptr instead of SharedHandle
Diffstat (limited to 'src/MetalinkPostDownloadHandler.cc')
| -rw-r--r-- | src/MetalinkPostDownloadHandler.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/MetalinkPostDownloadHandler.cc b/src/MetalinkPostDownloadHandler.cc index 44f794cf..fbd47030 100644 --- a/src/MetalinkPostDownloadHandler.cc +++ b/src/MetalinkPostDownloadHandler.cc @@ -56,7 +56,7 @@ namespace aria2 { MetalinkPostDownloadHandler::MetalinkPostDownloadHandler() { - SharedHandle<RequestGroupCriteria> cri + std::shared_ptr<RequestGroupCriteria> cri (new ContentTypeRequestGroupCriteria (getMetalinkContentTypes(), getMetalinkExtensions())); setCriteria(cri); @@ -67,13 +67,13 @@ MetalinkPostDownloadHandler::~MetalinkPostDownloadHandler() {} namespace { const std::string& getBaseUri(RequestGroup* requestGroup) { - const SharedHandle<DownloadContext>& dctx = + const std::shared_ptr<DownloadContext>& dctx = requestGroup->getDownloadContext(); if(dctx->getFileEntries().empty()) { return A2STR::NIL; } else { // TODO Check download result for each URI - const SharedHandle<FileEntry>& entry = dctx->getFirstFileEntry(); + const std::shared_ptr<FileEntry>& entry = dctx->getFirstFileEntry(); const std::deque<std::string>& spentUris = entry->getSpentUris(); if(spentUris.empty()) { const std::deque<std::string>& remainingUris = entry->getRemainingUris(); @@ -90,22 +90,22 @@ const std::string& getBaseUri(RequestGroup* requestGroup) } // namespace void MetalinkPostDownloadHandler::getNextRequestGroups -(std::vector<SharedHandle<RequestGroup> >& groups, +(std::vector<std::shared_ptr<RequestGroup> >& groups, RequestGroup* requestGroup) { A2_LOG_DEBUG(fmt("Generating RequestGroups for Metalink file %s", requestGroup->getFirstFilePath().c_str())); - SharedHandle<DiskAdaptor> diskAdaptor = + std::shared_ptr<DiskAdaptor> diskAdaptor = requestGroup->getPieceStorage()->getDiskAdaptor(); try { diskAdaptor->openExistingFile(); //requestOption.put(PREF_DIR, requestGroup->getDownloadContext()->getDir()); const std::string& baseUri = getBaseUri(requestGroup); - std::vector<SharedHandle<RequestGroup> > newRgs; + std::vector<std::shared_ptr<RequestGroup> > newRgs; Metalink2RequestGroup().generate(newRgs, diskAdaptor, requestGroup->getOption(), baseUri); requestGroup->followedBy(newRgs.begin(), newRgs.end()); - SharedHandle<MetadataInfo> mi = + std::shared_ptr<MetadataInfo> mi = createMetadataInfoFromFirstFileEntry(requestGroup->getGroupId(), requestGroup->getDownloadContext()); if(mi) { |
