From 07d270c87e6f9184aea4ca17eb26e466712e8db2 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 22 Jun 2013 01:10:38 +0900 Subject: Require -std=c++11 and use std::shared_ptr instead of SharedHandle --- src/HttpServerCommand.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/HttpServerCommand.cc') diff --git a/src/HttpServerCommand.cc b/src/HttpServerCommand.cc index 848df1bf..257ab474 100644 --- a/src/HttpServerCommand.cc +++ b/src/HttpServerCommand.cc @@ -64,7 +64,7 @@ namespace aria2 { HttpServerCommand::HttpServerCommand (cuid_t cuid, DownloadEngine* e, - const SharedHandle& socket, + const std::shared_ptr& socket, bool secure) : Command(cuid), e_(e), @@ -90,9 +90,9 @@ HttpServerCommand::HttpServerCommand HttpServerCommand::HttpServerCommand (cuid_t cuid, - const SharedHandle& httpServer, + const std::shared_ptr& httpServer, DownloadEngine* e, - const SharedHandle& socket) + const std::shared_ptr& socket) : Command(cuid), e_(e), socket_(socket), @@ -137,7 +137,7 @@ std::string createWebSocketServerKey(const std::string& clientKey) } // namespace namespace { -int websocketHandshake(const SharedHandle& header) +int websocketHandshake(const std::shared_ptr& header) { if(header->getMethod() != "GET" || header->find(HttpHeader::SEC_WEBSOCKET_KEY).empty()) { @@ -190,7 +190,7 @@ bool HttpServerCommand::execute() } #endif // ENABLE_SSL - SharedHandle header; + std::shared_ptr header; header = httpServer_->receiveRequest(); if(!header) { updateWriteCheck(); -- cgit