ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Put boost placeholders in a namespace (hack)

Browse Source
This commit is contained in:
Vinnie Falco
2013-06-28 10:19:40 -07:00
parent b0c401bc3f
commit ebd10afdb2
9 changed files with 99 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ripple_app/ripple_app.cpp
View File

@@ -14,6 +14,9 @@
#include "BeastConfig.h"
// This must come first to work around the boost placeholders issues
#include "modules/beast_basics/beast_basics.h"
// VFALCO NOTE Holy smokes...that's a lot of boost!!!
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/predicate.hpp>
@@ -26,7 +29,6 @@
#include <boost/bimap/list_of.hpp>
#include <boost/bimap/multiset_of.hpp>
#include <boost/bimap/unordered_set_of.hpp>
#include <boost/bind.hpp>
#include <boost/cstdint.hpp>
#include <boost/date_time/posix_time/posix_time_types.hpp>
#include <boost/enable_shared_from_this.hpp>

17
modules/ripple_basics/ripple_basics.h
View File

@@ -22,6 +22,9 @@
#include "system/ripple_StandardIncludes.h"
// This must come before Boost, to fix the boost placeholders problem
#include "modules/beast_basics/beast_basics.h"
#include "system/ripple_BoostIncludes.h"
#include "system/ripple_OpenSSLIncludes.h"
@@ -62,7 +65,7 @@ namespace boost
#endif
#include "modules/beast_core/beast_core.h"
#include "modules/beast_basics/beast_basics.h"
//#include "modules/beast_basics/beast_basics.h"
// VFALCO TODO Fix this for FreeBSD
//#include "modules/beast_basics/beast_basics.h"
@@ -72,17 +75,7 @@ namespace boost
namespace ripple
{
// VFALCO TODO Make this work. We have to get rid of BIND_TYPE,
// FUNC_TYPE, and P_* placeholders.
//
//using namespace beast;
using beast::int16;
using beast::int32;
using beast::int64;
using beast::uint16;
using beast::uint32;
using beast::uint64;
using namespace beast;
#include "utility/ripple_Log.h" // Needed by others

2
modules/ripple_websocket/autosocket/ripple_AutoSocket.h
View File

@@ -90,7 +90,7 @@ public:
mSocket->set_verify_mode (boost::asio::ssl::verify_peer);
// XXX Verify semantics of RFC 2818 are what we want.
mSocket->set_verify_callback (boost::bind (&rfc2818_verify, strDomain, _1, _2), ec);
mSocket->set_verify_callback (boost::bind (&rfc2818_verify, strDomain, boost::placeholders::_1, boost::placeholders::_2), ec);
return ec;
}