From 7dd41ffb5b7024a7687090e47fb87bd51c68aceb Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Sun, 22 Sep 2013 01:07:42 -0700 Subject: [PATCH] Fix BeforeBoost.h include --- .../modules/beast_core/system/BeforeBoost.h | 51 +------------------ 1 file changed, 1 insertion(+), 50 deletions(-) diff --git a/src/beast/modules/beast_core/system/BeforeBoost.h b/src/beast/modules/beast_core/system/BeforeBoost.h index 2cf22d58a..601fa5a91 100644 --- a/src/beast/modules/beast_core/system/BeforeBoost.h +++ b/src/beast/modules/beast_core/system/BeforeBoost.h @@ -28,55 +28,6 @@ // If you don't include this file, and you include boost headers, // Beast will generate a compile error with an explanation of why. -#if BEAST_USE_BOOST_FEATURES - -// Prevent from being included -#ifdef BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED -# error "boost/bind.hpp must not be included before this file" -#else -# define BOOST_BIND_PLACEHOLDERS_HPP_INCLUDED -#endif - -#include -#include -#include -#include -#include // for FifoFreeStoreWithTLS -#include - -#if BOOST_VERSION > 105499 -# error "This hasnt been tested with boost versions above 1.54" -#endif - -// This is a hack to fix boost's goofy placeholders going into the global -// namespace. First we prevent the user from including boost/bind.hpp -// before us. Then we define the include guard macro and include -// boost/bind.hpp ourselves to get the declarations. Finally we repeat -// the missing placeholder declarations but put them in a proper namespace. -// -// We put the placeholders in boost::placeholders so they can be accessed -// explicitly to handle the common case of a "using namespace oost" directive -// being in effect. -// -// Declarations based on boost/bind/placeholders.cpp -// -namespace boost { -namespace placeholders { -extern boost::arg<1> _1; -extern boost::arg<2> _2; -extern boost::arg<3> _3; -extern boost::arg<4> _4; -extern boost::arg<5> _5; -extern boost::arg<6> _6; -extern boost::arg<7> _7; -extern boost::arg<8> _8; -extern boost::arg<9> _9; -} -using namespace placeholders; -} - -#endif - -//------------------------------------------------------------------------------ +#include "BoostPlaceholdersFix.h" #endif