update boost on linux
This commit is contained in:
@@ -10,6 +10,7 @@
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
#include <boost/spirit/home/classic/phoenix/tuples.hpp>
|
||||
#include <boost/type_traits/remove_reference.hpp>
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
namespace phoenix {
|
||||
@@ -120,7 +121,7 @@ template <typename ActorT, typename TupleT>
|
||||
struct actor_result {
|
||||
|
||||
typedef typename ActorT::template result<TupleT>::type type;
|
||||
typedef typename remove_reference<type>::type plain_type;
|
||||
typedef typename boost::remove_reference<type>::type plain_type;
|
||||
};
|
||||
|
||||
//////////////////////////////////
|
||||
|
||||
@@ -1374,13 +1374,13 @@ namespace impl {
|
||||
<OperationT, actor<BaseT>, B>::type type;
|
||||
|
||||
static type
|
||||
construct(actor<BaseT> const& _0, B const& _1)
|
||||
construct(actor<BaseT> const& _0_, B const& _1_)
|
||||
{
|
||||
typedef typename make_composite
|
||||
<OperationT, actor<BaseT>, B>::composite_type
|
||||
ret_t;
|
||||
|
||||
return ret_t(OperationT(), _0, as_actor<B>::convert(_1));
|
||||
return ret_t(OperationT(), _0_, as_actor<B>::convert(_1_));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1392,13 +1392,13 @@ namespace impl {
|
||||
<OperationT, A, actor<BaseT> >::type type;
|
||||
|
||||
static type
|
||||
construct(A const& _0, actor<BaseT> const& _1)
|
||||
construct(A const& _0_, actor<BaseT> const& _1_)
|
||||
{
|
||||
typedef typename make_composite
|
||||
<OperationT, A, actor<BaseT> >::composite_type
|
||||
ret_t;
|
||||
|
||||
return ret_t(OperationT(), as_actor<A>::convert(_0), _1);
|
||||
return ret_t(OperationT(), as_actor<A>::convert(_0_), _1_);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1410,13 +1410,13 @@ namespace impl {
|
||||
<OperationT, actor<BaseA>, actor<BaseB> >::type type;
|
||||
|
||||
static type
|
||||
construct(actor<BaseA> const& _0, actor<BaseB> const& _1)
|
||||
construct(actor<BaseA> const& _0_, actor<BaseB> const& _1_)
|
||||
{
|
||||
typedef typename make_composite
|
||||
<OperationT, actor<BaseA>, actor<BaseB> >::composite_type
|
||||
ret_t;
|
||||
|
||||
return ret_t(OperationT(), _0, _1);
|
||||
return ret_t(OperationT(), _0_, _1_);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
#include <boost/spirit/home/classic/phoenix/operators.hpp>
|
||||
#include <iosfwd>
|
||||
#include <complex>
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
#if defined(_STLPORT_VERSION) && defined(__STL_USE_OWN_NAMESPACE)
|
||||
@@ -29,18 +30,6 @@
|
||||
#define PHOENIX_STD std
|
||||
#endif
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
//#if !defined(PHOENIX_NO_STD_NAMESPACE)
|
||||
namespace PHOENIX_STD
|
||||
{
|
||||
//#endif
|
||||
|
||||
template<typename T> class complex;
|
||||
|
||||
//#if !defined(PHOENIX_NO_STD_NAMESPACE)
|
||||
}
|
||||
//#endif
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
namespace phoenix
|
||||
{
|
||||
|
||||
@@ -207,7 +207,7 @@ struct tuple_element
|
||||
typedef nil_t& rtype;
|
||||
typedef nil_t const& crtype;
|
||||
|
||||
static nil_t get(TupleT const& t) { return nil_t(); }
|
||||
static nil_t get(TupleT const&) { return nil_t(); }
|
||||
};
|
||||
|
||||
//////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user