ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-29 15:35:50 +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

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