jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed dependency of boost::deadline_timer if USE_STANDALONE_ASIO is defined.

Browse source
This commit is contained in:
Breeze Chen 2017-08-29 11:19:52 +08:00
commit 28803d81be
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server_http.hpp
View file

@ -12,6 +12,7 @@
#ifdef USE_STANDALONE_ASIO #ifdef USE_STANDALONE_ASIO
#include <asio.hpp> #include <asio.hpp>
#include <asio/basic_waitable_timer.hpp>
namespace SimpleWeb { namespace SimpleWeb {
using error_code = std::error_code; using error_code = std::error_code;
using errc = std::errc; using errc = std::errc;
@ -19,6 +20,7 @@ namespace SimpleWeb {
} // namespace SimpleWeb } // namespace SimpleWeb
#else #else
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/asio/steady_timer.hpp>
namespace SimpleWeb { namespace SimpleWeb {
namespace asio = boost::asio; namespace asio = boost::asio;
using error_code = boost::system::error_code; using error_code = boost::system::error_code;
@ -214,7 +216,7 @@ namespace SimpleWeb {
std::unique_ptr<socket_type> socket; // Socket must be unique_ptr since asio::ssl::stream<asio::ip::tcp::socket> is not movable std::unique_ptr<socket_type> socket; // Socket must be unique_ptr since asio::ssl::stream<asio::ip::tcp::socket> is not movable
std::mutex socket_close_mutex; std::mutex socket_close_mutex;
std::unique_ptr<asio::deadline_timer> timer; std::unique_ptr<asio::steady_timer> timer;
void close() noexcept { void close() noexcept {
error_code ec; error_code ec;
@ -229,8 +231,8 @@ namespace SimpleWeb {
return; return;
} }
timer = std::unique_ptr<asio::deadline_timer>(new asio::deadline_timer(socket->get_io_service())); timer = std::unique_ptr<asio::steady_timer>(new asio::steady_timer(socket->get_io_service()));
timer->expires_from_now(boost::posix_time::seconds(seconds)); timer->expires_from_now(std::chrono::seconds(seconds));
auto self = this->shared_from_this(); auto self = this->shared_from_this();
timer->async_wait([self](const error_code &ec) { timer->async_wait([self](const error_code &ec) {
if(!ec) if(!ec)