ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix gcc compile

Browse Source
This commit is contained in:
Vinnie Falco
2013-08-16 14:06:59 -07:00
parent 4615297b00
commit 3db2b7d6a6
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/beast_asio/handshake/beast_HandshakeDetectLogicPROXY.h
View File

@@ -95,7 +95,7 @@ public:
{
using namespace InputParser;
if (! match (in, "PROXY "), state)
if (! match (in, "PROXY ", state))
return;
if (match (in, "TCP4 "))

12
modules/beast_asio/handshake/beast_HandshakeDetectStream.h
View File

@@ -79,18 +79,20 @@ class HandshakeDetectStreamType
, public boost::asio::socket_base
{
private:
typedef boost::system::error_code error_code;
typedef HandshakeDetectStreamType <Stream, Logic> this_type;
typedef boost::asio::streambuf buffer_type;
typedef typename boost::remove_reference <Stream>::type stream_type;
public:
typedef typename HandshakeDetectStream <Logic> CallbackType;
typedef typename HandshakeDetectStream <Logic>::Callback CallbackType;
/** This takes ownership of the callback.
The callback must be allocated with operator new.
*/
template <typename Arg>
HandshakeDetectStreamType (Callback* callback, Arg& arg)
HandshakeDetectStreamType (CallbackType* callback, Arg& arg)
: m_callback (callback)
, m_next_layer (arg)
, m_stream (m_next_layer)
@@ -139,7 +141,7 @@ public:
}
template <typename HandshakeHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(HandshakeHandler, void (error_code))
BEAST_ASIO_INITFN_RESULT_TYPE(HandshakeHandler, void (error_code))
async_handshake (handshake_type type, BOOST_ASIO_MOVE_ARG(HandshakeHandler) handler)
{
#if BEAST_ASIO_HAS_FUTURE_RETURNS
@@ -167,7 +169,7 @@ public:
}
template <typename ConstBufferSequence, typename BufferedHandshakeHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(BufferedHandshakeHandler, void (error_code, std::size_t))
BEAST_ASIO_INITFN_RESULT_TYPE(BufferedHandshakeHandler, void (error_code, std::size_t))
async_handshake(handshake_type type, const ConstBufferSequence& buffers,
BOOST_ASIO_MOVE_ARG(BufferedHandshakeHandler) handler)
{
@@ -316,7 +318,7 @@ public:
}
private:
ScopedPointer <typename HandshakeDetectStream <Logic>::Callback> m_callback;
ScopedPointer <CallbackType> m_callback;
Stream m_next_layer;
buffer_type m_buffer;
boost::asio::buffered_read_stream <stream_type&> m_stream;

2
modules/beast_asio/sockets/beast_SocketWrapper.h
View File

@@ -476,7 +476,7 @@ public:
}
template <typename MutableBufferSequence, typename ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void (error_code, std::size_t))
BEAST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void (error_code, std::size_t))
async_read_some (MutableBufferSequence const& buffers, BOOST_ASIO_MOVE_ARG(ReadHandler) handler,
boost::true_type)
{