Hack to put boost placeholders in a namespace

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

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