ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-30 16:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix c++0x errors

Browse Source
This commit is contained in:
Vinnie Falco
2013-08-10 00:43:55 -07:00
parent 2087c2aeb7
commit 58b0c0ef34
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Subtrees/beast/modules/beast_asio/tests/beast_TestPeerType.h
View File

@@ -67,8 +67,8 @@ public:
, Logic (get_socket ()) , Logic (get_socket ())
, Thread (name ()) , Thread (name ())
, m_timer (get_io_service ()) , m_timer (get_io_service ())
, m_timed_out (false)
, m_timer_set (false) , m_timer_set (false)
, m_timed_out (false)
{ {
} }

19
modules/ripple_asio/sockets/ripple_MultiSocketType.h
View File

@@ -498,7 +498,7 @@ public:
createPlainStreamSocket (); createPlainStreamSocket ();
} }
BOOST_ASIO_INITFN_RESULT_TYPE(ErrorCall, void (boost::system::error_code)) BEAST_ASIO_INITFN_RESULT_TYPE_MEMBER(ErrorCall, void (boost::system::error_code))
handshakePlainAsync (BOOST_ASIO_MOVE_ARG(ErrorCall) handler) handshakePlainAsync (BOOST_ASIO_MOVE_ARG(ErrorCall) handler)
{ {
createPlainStreamSocket (); createPlainStreamSocket ();
@@ -519,7 +519,7 @@ public:
m_ssl_stream->handshake (m_role, ec); m_ssl_stream->handshake (m_role, ec);
} }
BOOST_ASIO_INITFN_RESULT_TYPE(ErrorCall, void (boost::system::error_code)) BEAST_ASIO_INITFN_RESULT_TYPE_MEMBER(ErrorCall, void (boost::system::error_code))
handshakeSslAsync (BOOST_ASIO_MOVE_ARG(ErrorCall) handler) handshakeSslAsync (BOOST_ASIO_MOVE_ARG(ErrorCall) handler)
{ {
createSslStreamSocket (); createSslStreamSocket ();
@@ -528,7 +528,7 @@ public:
} }
#if BEAST_ASIO_HAS_BUFFEREDHANDSHAKE #if BEAST_ASIO_HAS_BUFFEREDHANDSHAKE
BOOST_ASIO_INITFN_RESULT_TYPE(TransferCall, void (boost::system::error_code, std::size_t)) BEAST_ASIO_INITFN_RESULT_TYPE_MEMBER(TransferCall, void (boost::system::error_code, std::size_t))
handshakePlainAsync (ConstBuffers const& buffers, handshakePlainAsync (ConstBuffers const& buffers,
BOOST_ASIO_MOVE_ARG (TransferCall) handler) BOOST_ASIO_MOVE_ARG (TransferCall) handler)
{ {
@@ -545,7 +545,7 @@ public:
m_ssl_stream->handshake (m_role, buffers, ec); m_ssl_stream->handshake (m_role, buffers, ec);
} }
BOOST_ASIO_INITFN_RESULT_TYPE (TransferCall, void (boost::system::error_code, std::size_t)) BEAST_ASIO_INITFN_RESULT_TYPE_MEMBER(TransferCall, void (boost::system::error_code, std::size_t))
handshakeSslAsync (ConstBuffers const& buffers, BOOST_ASIO_MOVE_ARG(TransferCall) handler) handshakeSslAsync (ConstBuffers const& buffers, BOOST_ASIO_MOVE_ARG(TransferCall) handler)
{ {
createSslStreamSocket (); createSslStreamSocket ();
@@ -589,7 +589,7 @@ public:
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
void onDetectRead (BOOST_ASIO_MOVE_ARG(ErrorCall) handler, void onDetectRead (ErrorCall handler,
boost::system::error_code const& ec, std::size_t bytes_transferred) boost::system::error_code const& ec, std::size_t bytes_transferred)
{ {
m_buffer.commit (bytes_transferred); m_buffer.commit (bytes_transferred);
@@ -634,19 +634,18 @@ public:
} }
} }
BOOST_ASIO_INITFN_RESULT_TYPE(ErrorCall, void (boost::system::error_code)) BEAST_ASIO_INITFN_RESULT_TYPE_MEMBER(ErrorCall, void (boost::system::error_code))
detectHandshakeAsync (BOOST_ASIO_MOVE_ARG(ErrorCall) handler) detectHandshakeAsync (BOOST_ASIO_MOVE_ARG(ErrorCall) handler)
{ {
bassert (m_buffer.size () == 0); bassert (m_buffer.size () == 0);
return m_next_layer.async_receive ( return m_next_layer.async_receive (
m_buffer.prepare (autoDetectBytes), boost::asio::socket_base::message_peek, m_buffer.prepare (autoDetectBytes), boost::asio::socket_base::message_peek,
m_strand.wrap (boost::bind (&ThisType::onDetectRead, this, m_strand.wrap (boost::bind (&ThisType::onDetectRead, this, handler,
BOOST_ASIO_MOVE_CAST(ErrorCall)(handler), boost::asio::placeholders::error, 0)));
boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)));
} }
#if BEAST_ASIO_HAS_BUFFEREDHANDSHAKE #if BEAST_ASIO_HAS_BUFFEREDHANDSHAKE
BOOST_ASIO_INITFN_RESULT_TYPE(TransferCall, void (boost::system::error_code, std::size_t)) BEAST_ASIO_INITFN_RESULT_TYPE_MEMBER(TransferCall, void (boost::system::error_code, std::size_t))
detectHandshakeAsync (ConstBuffers const& buffers, BOOST_ASIO_MOVE_ARG(TransferCall) handler) detectHandshakeAsync (ConstBuffers const& buffers, BOOST_ASIO_MOVE_ARG(TransferCall) handler)
{ {
fatal_error ("unimplemented"); fatal_error ("unimplemented");