Browse Source

eliminate boost::protect

pull/70/head
orignal 11 years ago
parent
commit
66ff2c7875
  1. 5
      HTTPServer.cpp
  2. 4
      Streaming.h

5
HTTPServer.cpp

@ -1,5 +1,4 @@
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/bind/protect.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include "base64.h" #include "base64.h"
#include "Log.h" #include "Log.h"
@ -388,8 +387,8 @@ namespace util
{ {
if (m_Stream) if (m_Stream)
m_Stream->AsyncReceive (boost::asio::buffer (m_StreamBuffer, 8192), m_Stream->AsyncReceive (boost::asio::buffer (m_StreamBuffer, 8192),
boost::protect (boost::bind (&HTTPConnection::HandleStreamReceive, this, boost::bind (&HTTPConnection::HandleStreamReceive, this,
boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)), boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred),
45); // 45 seconds timeout 45); // 45 seconds timeout
} }

4
Streaming.h

@ -214,8 +214,8 @@ namespace stream
} }
} }
m_ReceiveTimer.expires_from_now (boost::posix_time::seconds(timeout)); m_ReceiveTimer.expires_from_now (boost::posix_time::seconds(timeout));
m_ReceiveTimer.async_wait (boost::bind (&Stream::HandleReceiveTimer<Buffer, ReceiveHandler>, m_ReceiveTimer.async_wait ([&buffer, handler, this](const boost::system::error_code& ecode)
this, boost::asio::placeholders::error, buffer, handler)); { this->HandleReceiveTimer (ecode, buffer, handler); });
} }
template<typename Buffer, typename ReceiveHandler> template<typename Buffer, typename ReceiveHandler>

Loading…
Cancel
Save