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/AbstractHttpServerResponseCommand.cc | |
| parent | 126a4bde612eb0e6c48cf2f13ebe3eac45cc71a8 (diff) | |
Require -std=c++11 and use std::shared_ptr instead of SharedHandle
Diffstat (limited to 'src/AbstractHttpServerResponseCommand.cc')
| -rw-r--r-- | src/AbstractHttpServerResponseCommand.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/AbstractHttpServerResponseCommand.cc b/src/AbstractHttpServerResponseCommand.cc index 5d9d8c11..e83c4c1e 100644 --- a/src/AbstractHttpServerResponseCommand.cc +++ b/src/AbstractHttpServerResponseCommand.cc @@ -49,9 +49,9 @@ namespace aria2 { AbstractHttpServerResponseCommand::AbstractHttpServerResponseCommand (cuid_t cuid, - const SharedHandle<HttpServer>& httpServer, + const std::shared_ptr<HttpServer>& httpServer, DownloadEngine* e, - const SharedHandle<SocketCore>& socket) + const std::shared_ptr<SocketCore>& socket) : Command(cuid), e_(e), socket_(socket), @@ -107,20 +107,21 @@ bool AbstractHttpServerResponseCommand::execute() } } catch(RecoverableException& e) { A2_LOG_INFO_EX - (fmt("CUID#%"PRId64" - Error occurred while transmitting response body.", + (fmt("CUID#%" PRId64 + " - Error occurred while transmitting response body.", getCuid()), e); return true; } if(httpServer_->sendBufferIsEmpty()) { - A2_LOG_INFO(fmt("CUID#%"PRId64" - HttpServer: all response transmitted.", + A2_LOG_INFO(fmt("CUID#%" PRId64 " - HttpServer: all response transmitted.", getCuid())); afterSend(httpServer_, e_); return true; } else { if(timeoutTimer_.difference(global::wallclock()) >= 30) { - A2_LOG_INFO(fmt("CUID#%"PRId64" - HttpServer: Timeout while trasmitting" - " response.", + A2_LOG_INFO(fmt("CUID#%" PRId64 + " - HttpServer: Timeout while trasmitting response.", getCuid())); return true; } else { |