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

Hack to put boost placeholders in a namespace

Browse Source
This commit is contained in:
Vinnie Falco
2013-06-28 10:19:40 -07:00
parent f1a4ea3c3f
commit d80547e980
7 changed files with 74 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BeastConfig.h
View File

@@ -24,9 +24,6 @@
#define BEAST_USE_BOOST 1
// We bind functions that take references, which is
// unsupported on some platforms
//
// VFALCO TODO Fix this problem with FreeBSD and std::bind.
// We need to enforce a minimum library/g++ version.
//

57
Subtrees/beast/modules/beast_basics/beast_basics.h
View File

@@ -222,12 +222,12 @@
@todo Discuss the treatment of exceptions versus Error objects in the library.
@todo Discuss the additions to AppConfig.h
@todo Discuss the additions to BeastConfig.h
@defgroup beast_core beast_core
*/
/* See the Juce notes regarding AppConfig.h
/* See the JUCE notes regarding BeastConfig.h
This file must always be included before any Juce headers.
@@ -238,7 +238,7 @@
/* BeastConfig.h must be included before this file */
/* Use sensible default configurations if they forgot
to append the necessary macros into their AppConfig.h.
to append the necessary macros into their BeastConfig.h.
*/
#ifndef BEAST_USE_BOOST
#define BEAST_USE_BOOST 0
@@ -286,6 +286,57 @@
//------------------------------------------------------------------------------
// This is a hack to fix boost's goofy placeholders
#if BEAST_USE_BOOST
#ifdef BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED
#error <boost/bind.hpp> must not be included before this file
#endif
// Prevent <boost/bind/placeholders.hpp> from being included
#define BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED
#include <boost/bind/arg.hpp>
#include <boost/config.hpp>
// This is from <boost/bind/placeholders.cpp>
namespace boost {
namespace placeholders {
#if defined(__BORLANDC__) || defined(__GNUC__) && (__GNUC__ < 4)
static inline boost::arg<1> _1() { return boost::arg<1>(); }
static inline boost::arg<2> _2() { return boost::arg<2>(); }
static inline boost::arg<3> _3() { return boost::arg<3>(); }
static inline boost::arg<4> _4() { return boost::arg<4>(); }
static inline boost::arg<5> _5() { return boost::arg<5>(); }
static inline boost::arg<6> _6() { return boost::arg<6>(); }
static inline boost::arg<7> _7() { return boost::arg<7>(); }
static inline boost::arg<8> _8() { return boost::arg<8>(); }
static inline boost::arg<9> _9() { return boost::arg<9>(); }
#elif defined(BOOST_MSVC) || (defined(__DECCXX_VER) && __DECCXX_VER <= 60590031) || defined(__MWERKS__) || \
defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 2)
static boost::arg<1> _1;
static boost::arg<2> _2;
static boost::arg<3> _3;
static boost::arg<4> _4;
static boost::arg<5> _5;
static boost::arg<6> _6;
static boost::arg<7> _7;
static boost::arg<8> _8;
static boost::arg<9> _9;
#else
boost::arg<1> _1;
boost::arg<2> _2;
boost::arg<3> _3;
boost::arg<4> _4;
boost::arg<5> _5;
boost::arg<6> _6;
boost::arg<7> _7;
boost::arg<8> _8;
boost::arg<9> _9;
#endif
}
using namespace placeholders;
}
#endif
//------------------------------------------------------------------------------
// Choose a source of bind, placeholders, and function
#if !BEAST_BIND_USES_STD && !BEAST_BIND_USES_TR1 && !BEAST_BIND_USES_BOOST

5
Subtrees/websocket/src/roles/server.hpp
View File

@@ -551,10 +551,13 @@ void server<endpoint>::connection<connection_type>::async_init() {
m_connection.register_timeout(5000,fail::status::TIMEOUT_WS,
"Timeout on WebSocket handshake");
static boost::arg<1> pl1;
static boost::arg<2> pl2;
boost::shared_ptr<std::string> stringPtr = boost::make_shared<std::string>();
m_connection.get_socket().async_read_until(
m_connection.buffer(),
boost::bind(&match_header, stringPtr, _1, _2),
boost::bind(&match_header, stringPtr, pl1, pl2),
m_connection.get_strand().wrap(boost::bind(
&type::handle_read_request,
m_connection.shared_from_this(),

12
TODO.txt
View File

@@ -2,6 +2,13 @@
TODO
--------------------------------------------------------------------------------
- Make beast::HashMap support assignment via operator[]
- Rewrite TxFormats to use beast containers and RAII, and not leak
- Add ICore interface
- Make TxFormats a member of ICore instead of a singleton.
- Rename LoadMonitor to LoadMeter, change LoadEvent to LoadMeter::ScopedSample
- Fix all leaks on exit (!)
Say there's a leak, a ledger that can never be accessed is locked in some
@@ -23,13 +30,8 @@ TODO
- Remove "ENABLE_INSECURE" when the time is right.
- lift bind, function, and placeholders into ripple namespace
- lift beast into the ripple namespace, remove ripple's duplicated integer types
- lift unique_ptr / auto_ptr into ripple namespace, or replace with ScopedPointer
- Rewrite functions passed to bind to not take reference parameters, so we can
used std::bind instead of boost.
- Make LevelDB and Ripple code work with both Unicode and non-Unicode Windows APIs
- Raise the warning level and fix everything

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"
@@ -60,7 +63,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"
@@ -70,17 +73,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;
}