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

src/HttpResponseCommand.cc

@@ -84,11 +84,11 @@
 namespace aria2 {
 
 namespace {
-SharedHandle<StreamFilter> getTransferEncodingStreamFilter
-(const SharedHandle<HttpResponse>& httpResponse,
- const SharedHandle<StreamFilter>& delegate = SharedHandle<StreamFilter>())
+std::shared_ptr<StreamFilter> getTransferEncodingStreamFilter
+(const std::shared_ptr<HttpResponse>& httpResponse,
+ const std::shared_ptr<StreamFilter>& delegate = std::shared_ptr<StreamFilter>())
 {
-  SharedHandle<StreamFilter> filter;
+  std::shared_ptr<StreamFilter> filter;
   if(httpResponse->isTransferEncodingSpecified()) {
     filter = httpResponse->getTransferEncodingStreamFilter();
     if(!filter) {
@@ -107,11 +107,11 @@ SharedHandle<StreamFilter> getTransferEncodingStreamFilter
 } // namespace
 
 namespace {
-SharedHandle<StreamFilter> getContentEncodingStreamFilter
-(const SharedHandle<HttpResponse>& httpResponse,
- const SharedHandle<StreamFilter>& delegate = SharedHandle<StreamFilter>())
+std::shared_ptr<StreamFilter> getContentEncodingStreamFilter
+(const std::shared_ptr<HttpResponse>& httpResponse,
+ const std::shared_ptr<StreamFilter>& delegate = std::shared_ptr<StreamFilter>())
 {
-  SharedHandle<StreamFilter> filter;
+  std::shared_ptr<StreamFilter> filter;
   if(httpResponse->isContentEncodingSpecified()) {
     filter = httpResponse->getContentEncodingStreamFilter();
     if(!filter) {
@@ -134,12 +134,12 @@ SharedHandle<StreamFilter> getContentEncodingStreamFilter
 
 HttpResponseCommand::HttpResponseCommand
 (cuid_t cuid,
- const SharedHandle<Request>& req,
- const SharedHandle<FileEntry>& fileEntry,
+ const std::shared_ptr<Request>& req,
+ const std::shared_ptr<FileEntry>& fileEntry,
  RequestGroup* requestGroup,
- const SharedHandle<HttpConnection>& httpConnection,
+ const std::shared_ptr<HttpConnection>& httpConnection,
  DownloadEngine* e,
- const SharedHandle<SocketCore>& s)
+ const std::shared_ptr<SocketCore>& s)
   : AbstractCommand(cuid, req, fileEntry, requestGroup, e, s,
                     httpConnection->getSocketRecvBuffer()),
     httpConnection_(httpConnection)
@@ -151,8 +151,8 @@ HttpResponseCommand::~HttpResponseCommand() {}
 
 bool HttpResponseCommand::executeInternal()
 {
-  SharedHandle<HttpRequest> httpRequest =httpConnection_->getFirstHttpRequest();
-  SharedHandle<HttpResponse> httpResponse = httpConnection_->receiveResponse();
+  std::shared_ptr<HttpRequest> httpRequest =httpConnection_->getFirstHttpRequest();
+  std::shared_ptr<HttpResponse> httpResponse = httpConnection_->receiveResponse();
   if(!httpResponse) {
     // The server has not responded to our request yet.
     // For socket->wantRead() == true, setReadCheckSocket(socket) is already
@@ -165,7 +165,7 @@ bool HttpResponseCommand::executeInternal()
   httpResponse->validateResponse();
   httpResponse->retrieveCookie();
 
-  SharedHandle<HttpHeader> httpHeader = httpResponse->getHttpHeader();
+  std::shared_ptr<HttpHeader> httpHeader = httpResponse->getHttpHeader();
   // Disable persistent connection if:
   //   Connection: close is received or the remote server is not HTTP/1.1.
   // We don't care whether non-HTTP/1.1 server returns Connection: keep-alive.
@@ -332,7 +332,7 @@ void HttpResponseCommand::updateLastModifiedTime(const Time& lastModified)
 }
 
 bool HttpResponseCommand::shouldInflateContentEncoding
-(const SharedHandle<HttpResponse>& httpResponse)
+(const std::shared_ptr<HttpResponse>& httpResponse)
 {
   // Basically, on the fly inflation cannot be made with segment
   // download, because in each segment we don't know where the date
@@ -347,12 +347,12 @@ bool HttpResponseCommand::shouldInflateContentEncoding
 }
 
 bool HttpResponseCommand::handleDefaultEncoding
-(const SharedHandle<HttpResponse>& httpResponse)
+(const std::shared_ptr<HttpResponse>& httpResponse)
 {
-  SharedHandle<HttpRequest> httpRequest = httpResponse->getHttpRequest();
-  SharedHandle<BtProgressInfoFile> progressInfoFile
+  std::shared_ptr<HttpRequest> httpRequest = httpResponse->getHttpRequest();
+  std::shared_ptr<BtProgressInfoFile> progressInfoFile
     (new DefaultBtProgressInfoFile
-     (getDownloadContext(), SharedHandle<PieceStorage>(), getOption().get()));
+     (getDownloadContext(), std::shared_ptr<PieceStorage>(), getOption().get()));
   getRequestGroup()->adjustFilename(progressInfoFile);
   getRequestGroup()->initPieceStorage();
 
@@ -361,7 +361,7 @@ bool HttpResponseCommand::handleDefaultEncoding
     return true;
   }
 
-  SharedHandle<CheckIntegrityEntry> checkEntry =
+  std::shared_ptr<CheckIntegrityEntry> checkEntry =
     getRequestGroup()->createCheckIntegrityEntry();
   if(!checkEntry) {
     return true;
@@ -370,7 +370,7 @@ bool HttpResponseCommand::handleDefaultEncoding
   // We have to make sure that command that has Request object must
   // have segment after PieceStorage is initialized. See
   // AbstractCommand::execute()
-  SharedHandle<Segment> segment =
+  std::shared_ptr<Segment> segment =
     getSegmentMan()->getSegmentWithIndex(getCuid(), 0);
   // pipelining requires implicit range specified. But the request for
   // this response most likely dones't contains range header. This means
@@ -403,9 +403,9 @@ bool HttpResponseCommand::handleDefaultEncoding
 }
 
 bool HttpResponseCommand::handleOtherEncoding
-(const SharedHandle<HttpResponse>& httpResponse) {
+(const std::shared_ptr<HttpResponse>& httpResponse) {
   // We assume that RequestGroup::getTotalLength() == 0 here
-  SharedHandle<HttpRequest> httpRequest = httpResponse->getHttpRequest();
+  std::shared_ptr<HttpRequest> httpRequest = httpResponse->getHttpRequest();
 
   if(getOption()->getAsBool(PREF_DRY_RUN)) {
     getRequestGroup()->initPieceStorage();
@@ -422,7 +422,7 @@ bool HttpResponseCommand::handleOtherEncoding
   // In this context, knowsTotalLength() is true only when the file is
   // really zero-length.
 
-  SharedHandle<StreamFilter> streamFilter =
+  std::shared_ptr<StreamFilter> streamFilter =
     getTransferEncodingStreamFilter
     (httpResponse,
      getContentEncodingStreamFilter(httpResponse));
@@ -441,7 +441,7 @@ bool HttpResponseCommand::handleOtherEncoding
     // See also FtpNegotiationCommand::onFileSizeDetermined()
     if(getDownloadContext()->isChecksumVerificationNeeded()) {
       A2_LOG_DEBUG("Zero length file exists. Verify checksum.");
-      SharedHandle<ChecksumCheckIntegrityEntry> entry
+      std::shared_ptr<ChecksumCheckIntegrityEntry> entry
         (new ChecksumCheckIntegrityEntry(getRequestGroup()));
       entry->initValidator();
       getPieceStorage()->getDiskAdaptor()->openExistingFile();
@@ -475,7 +475,7 @@ bool HttpResponseCommand::handleOtherEncoding
 #ifdef ENABLE_MESSAGE_DIGEST
     if(getDownloadContext()->isChecksumVerificationNeeded()) {
       A2_LOG_DEBUG("Verify checksum for zero-length file");
-      SharedHandle<ChecksumCheckIntegrityEntry> entry
+      std::shared_ptr<ChecksumCheckIntegrityEntry> entry
         (new ChecksumCheckIntegrityEntry(getRequestGroup()));
       entry->initValidator();
       getDownloadEngine()->getCheckIntegrityMan()->pushEntry(entry);
@@ -498,9 +498,9 @@ bool HttpResponseCommand::handleOtherEncoding
 }
 
 bool HttpResponseCommand::skipResponseBody
-(const SharedHandle<HttpResponse>& httpResponse)
+(const std::shared_ptr<HttpResponse>& httpResponse)
 {
-  SharedHandle<StreamFilter> filter =
+  std::shared_ptr<StreamFilter> filter =
     getTransferEncodingStreamFilter(httpResponse);
   // We don't use Content-Encoding here because this response body is just
   // thrown away.
@@ -528,10 +528,10 @@ bool HttpResponseCommand::skipResponseBody
 
 namespace {
 bool decideFileAllocation
-(const SharedHandle<StreamFilter>& filter)
+(const std::shared_ptr<StreamFilter>& filter)
 {
 #ifdef HAVE_ZLIB
-  for(SharedHandle<StreamFilter> f = filter; f; f = f->getDelegate()){
+  for(std::shared_ptr<StreamFilter> f = filter; f; f = f->getDelegate()){
     // Since the compressed file's length are returned in the response header
     // and the decompressed file size is unknown at this point, disable file
     // allocation here.
@@ -545,8 +545,8 @@ bool decideFileAllocation
 } // namespace
 
 HttpDownloadCommand* HttpResponseCommand::createHttpDownloadCommand
-(const SharedHandle<HttpResponse>& httpResponse,
- const SharedHandle<StreamFilter>& filter)
+(const std::shared_ptr<HttpResponse>& httpResponse,
+ const std::shared_ptr<StreamFilter>& filter)
 {
 
   HttpDownloadCommand* command =
@@ -585,7 +585,7 @@ void HttpResponseCommand::onDryRunFileFound()
 
 #ifdef ENABLE_MESSAGE_DIGEST
 bool HttpResponseCommand::checkChecksum
-(const SharedHandle<DownloadContext>& dctx,
+(const std::shared_ptr<DownloadContext>& dctx,
  const Checksum& checksum)
 {
   if(dctx->getHashType() == checksum.getHashType()) {