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

Fix gcc compile errors

Browse Source
This commit is contained in:
Vinnie Falco
2013-08-07 13:09:56 -07:00
parent c018337831
commit cd4961f017
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Subtrees/beast/modules/beast_asio/sockets/beast_Socket.h
View File

@@ -104,7 +104,7 @@ public:
{ {
void* const object = native_object_raw (); void* const object = native_object_raw ();
if (object == nullptr) if (object == nullptr)
throw std::bad_cast ("null pointer"); Throw (std::bad_cast (), __FILE__, __LINE__);
return *static_cast <Object*> (object); return *static_cast <Object*> (object);
} }

14
Subtrees/beast/modules/beast_asio/sockets/beast_SocketWrapper.h
View File

@@ -247,7 +247,7 @@ private:
template <typename MutableBufferSequence, typename ReadHandler> template <typename MutableBufferSequence, typename ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void (boost::system::error_code, std::size_t)) BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void (boost::system::error_code, std::size_t))
async_read_some (MutableBufferSequence const&, BOOST_ASIO_MOVE_ARG(ReadHandler), async_read_some (MutableBufferSequence const&, BOOST_ASIO_MOVE_ARG(ReadHandler) handler,
boost::false_type) boost::false_type)
{ {
#if BOOST_ASIO_HAS_FUTURE_RETURNS #if BOOST_ASIO_HAS_FUTURE_RETURNS
@@ -259,7 +259,7 @@ private:
get_io_service ().post (boost::bind (handler, ec, 0)); get_io_service ().post (boost::bind (handler, ec, 0));
return init.result.get(); return init.result.get();
#else #else
system::error_code ec; boost::system::error_code ec;
ec = pure_virtual (ec); ec = pure_virtual (ec);
get_io_service ().post (boost::bind (handler, ec, 0)); get_io_service ().post (boost::bind (handler, ec, 0));
#endif #endif
@@ -284,7 +284,7 @@ private:
template <typename ConstBufferSequence, typename WriteHandler> template <typename ConstBufferSequence, typename WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(WriteHandler, void (boost::system::error_code, std::size_t)) BOOST_ASIO_INITFN_RESULT_TYPE(WriteHandler, void (boost::system::error_code, std::size_t))
async_write_some (ConstBufferSequence const&, BOOST_ASIO_MOVE_ARG(WriteHandler), async_write_some (ConstBufferSequence const&, BOOST_ASIO_MOVE_ARG(WriteHandler) handler,
boost::false_type) boost::false_type)
{ {
#if BOOST_ASIO_HAS_FUTURE_RETURNS #if BOOST_ASIO_HAS_FUTURE_RETURNS
@@ -296,7 +296,7 @@ private:
get_io_service ().post (boost::bind (handler, ec, 0)); get_io_service ().post (boost::bind (handler, ec, 0));
return init.result.get(); return init.result.get();
#else #else
system::error_code ec; boost::system::error_code ec;
ec = pure_virtual (ec); ec = pure_virtual (ec);
get_io_service ().post (boost::bind (handler, ec, 0)); get_io_service ().post (boost::bind (handler, ec, 0));
#endif #endif
@@ -359,7 +359,7 @@ private:
get_io_service ().post (boost::bind (handler, ec)); get_io_service ().post (boost::bind (handler, ec));
return init.result.get(); return init.result.get();
#else #else
system::error_code ec; boost::system::error_code ec;
ec = pure_virtual (ec); ec = pure_virtual (ec);
get_io_service ().post (boost::bind (handler, ec)); get_io_service ().post (boost::bind (handler, ec));
#endif #endif
@@ -425,7 +425,7 @@ private:
get_io_service ().post (boost::bind (handler, ec, 0)); get_io_service ().post (boost::bind (handler, ec, 0));
return init.result.get(); return init.result.get();
#else #else
system::error_code ec; boost::system::error_code ec;
ec = pure_virtual (ec); ec = pure_virtual (ec);
get_io_service ().post (boost::bind (handler, ec, 0)); get_io_service ().post (boost::bind (handler, ec, 0));
#endif #endif
@@ -482,7 +482,7 @@ private:
get_io_service ().post (boost::bind (handler, ec)); get_io_service ().post (boost::bind (handler, ec));
return init.result.get(); return init.result.get();
#else #else
system::error_code ec; boost::system::error_code ec;
ec = pure_virtual (ec); ec = pure_virtual (ec);
get_io_service ().post (boost::bind (handler, ec)); get_io_service ().post (boost::bind (handler, ec));
#endif #endif

1
Subtrees/beast/modules/beast_asio/system/beast_BoostIncludes.h
View File

@@ -40,6 +40,7 @@
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/asio/ssl.hpp> #include <boost/asio/ssl.hpp>
#include <boost/bind.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/type_traits.hpp> #include <boost/type_traits.hpp>

2
modules/ripple_app/peers/ripple_Peer.cpp
View File

@@ -63,7 +63,7 @@ private:
public: public:
static char const* getCountedObjectName () { return "Peer"; } static char const* getCountedObjectName () { return "Peer"; }
PeerImp::PeerImp (boost::asio::io_service& io_service, PeerImp (boost::asio::io_service& io_service,
boost::asio::ssl::context& ctx, boost::asio::ssl::context& ctx,
uint64 peerID, uint64 peerID,
bool inbound) bool inbound)