Require -std=c++11 and use std::shared_ptr instead of SharedHandle

1 files changed, 20 insertions, 21 deletions

diff --git a/src/download_helper.h b/src/download_helper.h
index 7a7fcd01..6289c481 100644
--- a/src/download_helper.h
+++ b/src/download_helper.h
@@ -40,8 +40,7 @@
 #include <string>
 #include <vector>
 #include <set>
-
-#include "SharedHandle.h"
+#include <memory>
 
 namespace aria2 {
 
@@ -61,8 +60,8 @@ class GroupId;
 // adjusted using bittorrent::adjustAnnounceUri().  In this function,
 // force-sequential is ignored.
 void createRequestGroupForBitTorrent
-(std::vector<SharedHandle<RequestGroup> >& result,
- const SharedHandle<Option>& option,
+(std::vector<std::shared_ptr<RequestGroup> >& result,
+ const std::shared_ptr<Option>& option,
  const std::vector<std::string>& uris,
  const std::string& metaInfoUri,
  const std::string& torrentData = "",
@@ -73,11 +72,11 @@ void createRequestGroupForBitTorrent
 // adjusted using bittorrent::adjustAnnounceUri().  In this function,
 // force-sequential is ignored.
 void createRequestGroupForBitTorrent
-(std::vector<SharedHandle<RequestGroup> >& result,
- const SharedHandle<Option>& option,
+(std::vector<std::shared_ptr<RequestGroup> >& result,
+ const std::shared_ptr<Option>& option,
  const std::vector<std::string>& uris,
  const std::string& metaInfoUri,
- const SharedHandle<ValueBase>& torrent,
+ const std::shared_ptr<ValueBase>& torrent,
  bool adjustAnnounceUri = true);
 
 #endif // ENABLE_BITTORRENT
@@ -87,8 +86,8 @@ void createRequestGroupForBitTorrent
 // metalink-file option. If non-empty metalinkData is specified, it is
 // used as a content of metalink file instead.
 void createRequestGroupForMetalink
-(std::vector<SharedHandle<RequestGroup> >& result,
- const SharedHandle<Option>& option,
+(std::vector<std::shared_ptr<RequestGroup> >& result,
+ const std::shared_ptr<Option>& option,
  const std::string& metalinkData = "");
 #endif // ENABLE_METALINK
 
@@ -100,7 +99,7 @@ void createRequestGroupForMetalink
 // is created and uriListParser reads all input, this function returns
 // false. The option is used as a option template.
 bool createRequestGroupFromUriListParser
-(std::vector<SharedHandle<RequestGroup> >& result,
+(std::vector<std::shared_ptr<RequestGroup> >& result,
  const Option* option,
  UriListParser* uriListParser);
 
@@ -108,9 +107,9 @@ bool createRequestGroupFromUriListParser
 // then UriListParser is configured to read from standard input.
 // Otherwise, this function first checks file denoted by filename
 // exists.  If it does not exist, this function throws exception.
-// This function returns SharedHandle<UriListParser> object if it
+// This function returns std::shared_ptr<UriListParser> object if it
 // succeeds.
-SharedHandle<UriListParser> openUriListParser(const std::string& filename);
+std::shared_ptr<UriListParser> openUriListParser(const std::string& filename);
 
 // Create RequestGroup objects from reading file specified by input-file option.
 // If the value of input-file option is "-", stdin is used as a input source.
@@ -118,8 +117,8 @@ SharedHandle<UriListParser> openUriListParser(const std::string& filename);
 // The additional out and dir options can be specified after each line of URIs.
 // This optional line must start with white space(s).
 void createRequestGroupForUriList
-(std::vector<SharedHandle<RequestGroup> >& result,
- const SharedHandle<Option>& option);
+(std::vector<std::shared_ptr<RequestGroup> >& result,
+ const std::shared_ptr<Option>& option);
 
 // Create RequestGroup object using provided uris.  If ignoreLocalPath
 // is true, a path to torrent file abd metalink file are ignored.  If
@@ -128,8 +127,8 @@ void createRequestGroupForUriList
 // given. If throwOnError is false, these errors are just logged as
 // error.
 void createRequestGroupForUri
-(std::vector<SharedHandle<RequestGroup> >& result,
- const SharedHandle<Option>& option,
+(std::vector<std::shared_ptr<RequestGroup> >& result,
+ const std::shared_ptr<Option>& option,
  const std::vector<std::string>& uris,
  bool ignoreForceSequential = false,
  bool ignoreLocalPath = false,
@@ -137,20 +136,20 @@ void createRequestGroupForUri
 
 template<typename InputIterator>
 void setMetadataInfo
-(InputIterator first, InputIterator last, const SharedHandle<MetadataInfo>& mi)
+(InputIterator first, InputIterator last, const std::shared_ptr<MetadataInfo>& mi)
 {
   for(; first != last; ++first) {
     (*first)->setMetadataInfo(mi);
   }
 }
 
-SharedHandle<MetadataInfo>
-createMetadataInfoFromFirstFileEntry(const SharedHandle<GroupId>& gid,
-                                     const SharedHandle<DownloadContext>& dctx);
+std::shared_ptr<MetadataInfo>
+createMetadataInfoFromFirstFileEntry(const std::shared_ptr<GroupId>& gid,
+                                     const std::shared_ptr<DownloadContext>& dctx);
 
 // Removes option value which is only effective at the first
 // construction time.
-void removeOneshotOption(const SharedHandle<Option>& option);
+void removeOneshotOption(const std::shared_ptr<Option>& option);
 
 } // namespace aria2