Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/phoenix/operator')
13 files changed, 28 insertions, 25 deletions
diff --git a/3rdParty/Boost/src/boost/phoenix/operator/comparison.hpp b/3rdParty/Boost/src/boost/phoenix/operator/comparison.hpp index 987c5a7..bea292f 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/comparison.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/comparison.hpp @@ -11,6 +11,7 @@ #include <boost/phoenix/operator/detail/define_operator.hpp> #include <boost/phoenix/core/expression.hpp> #include <boost/proto/operators.hpp> +#include <boost/proto/fusion.hpp> // Added to solve bug 6268 namespace boost { namespace phoenix { diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/define_operator.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/define_operator.hpp index cc35f1a..3de63b8 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/define_operator.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/define_operator.hpp @@ -44,8 +44,9 @@ {}; \ } \ template <typename Operand> \ + inline \ typename result_of::BOOST_PP_CAT(make_, name)<Operand>::type \ - inline BOOST_PP_CAT(make_, name)(Operand const & operand) \ + BOOST_PP_CAT(make_, name)(Operand const & operand) \ { \ return functional::BOOST_PP_CAT(make_, name)()(operand); \ } \ @@ -83,8 +84,9 @@ {}; \ } \ template <typename Rhs, typename Lhs> \ + inline \ typename result_of::BOOST_PP_CAT(make_, name)<Rhs, Lhs>::type \ - inline BOOST_PP_CAT(make_, name)(Lhs const & lhs, Rhs const & rhs) \ + BOOST_PP_CAT(make_, name)(Lhs const & lhs, Rhs const & rhs) \ { \ return functional::BOOST_PP_CAT(make_, name)()(lhs, rhs); \ } \ diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/mem_fun_ptr_gen.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/mem_fun_ptr_gen.hpp index 59f5d5c..59a5223 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/mem_fun_ptr_gen.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/mem_fun_ptr_gen.hpp @@ -43,9 +43,9 @@ namespace boost { namespace phoenix template <typename Object, typename MemPtr> struct mem_fun_ptr_gen { - mem_fun_ptr_gen(Object const& obj, MemPtr ptr) - : obj(obj) - , ptr(ptr) + mem_fun_ptr_gen(Object const& obj_, MemPtr ptr_) + : obj(obj_) + , ptr(ptr_) {} typename phoenix::expression::mem_fun_ptr<Object, MemPtr>::type const diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_10.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_10.hpp index 2b6ccae..0e2e305 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_10.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_10.hpp @@ -12,9 +12,9 @@ namespace boost { namespace phoenix template <typename Object, typename MemPtr> struct mem_fun_ptr_gen { - mem_fun_ptr_gen(Object const& obj, MemPtr ptr) - : obj(obj) - , ptr(ptr) + mem_fun_ptr_gen(Object const& obj_, MemPtr ptr_) + : obj(obj_) + , ptr(ptr_) {} typename phoenix::expression::mem_fun_ptr<Object, MemPtr>::type const operator()() const diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_20.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_20.hpp index ac4621a..b5a8368 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_20.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_20.hpp @@ -12,9 +12,9 @@ namespace boost { namespace phoenix template <typename Object, typename MemPtr> struct mem_fun_ptr_gen { - mem_fun_ptr_gen(Object const& obj, MemPtr ptr) - : obj(obj) - , ptr(ptr) + mem_fun_ptr_gen(Object const& obj_, MemPtr ptr_) + : obj(obj_) + , ptr(ptr_) {} typename phoenix::expression::mem_fun_ptr<Object, MemPtr>::type const operator()() const diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_30.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_30.hpp index 8e0fba4..a715947 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_30.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_30.hpp @@ -12,9 +12,9 @@ namespace boost { namespace phoenix template <typename Object, typename MemPtr> struct mem_fun_ptr_gen { - mem_fun_ptr_gen(Object const& obj, MemPtr ptr) - : obj(obj) - , ptr(ptr) + mem_fun_ptr_gen(Object const& obj_, MemPtr ptr_) + : obj(obj_) + , ptr(ptr_) {} typename phoenix::expression::mem_fun_ptr<Object, MemPtr>::type const operator()() const diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_40.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_40.hpp index a61836e..c11e486 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_40.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_40.hpp @@ -12,9 +12,9 @@ namespace boost { namespace phoenix template <typename Object, typename MemPtr> struct mem_fun_ptr_gen { - mem_fun_ptr_gen(Object const& obj, MemPtr ptr) - : obj(obj) - , ptr(ptr) + mem_fun_ptr_gen(Object const& obj_, MemPtr ptr_) + : obj(obj_) + , ptr(ptr_) {} typename phoenix::expression::mem_fun_ptr<Object, MemPtr>::type const operator()() const diff --git a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_50.hpp b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_50.hpp index d93a324..8e0f536 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_50.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/detail/preprocessed/mem_fun_ptr_gen_50.hpp @@ -12,9 +12,9 @@ namespace boost { namespace phoenix template <typename Object, typename MemPtr> struct mem_fun_ptr_gen { - mem_fun_ptr_gen(Object const& obj, MemPtr ptr) - : obj(obj) - , ptr(ptr) + mem_fun_ptr_gen(Object const& obj_, MemPtr ptr_) + : obj(obj_) + , ptr(ptr_) {} typename phoenix::expression::mem_fun_ptr<Object, MemPtr>::type const operator()() const diff --git a/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_10.hpp b/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_10.hpp index 5e18781..1c2049b 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_10.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_10.hpp @@ -7,7 +7,7 @@ ==============================================================================*/ namespace boost { namespace phoenix { - namespace expression { template <typename Lhs, typename Rhs> struct mem_ptr : expr<proto::tag:: mem_ptr, Lhs, Rhs> {}; typedef proto::functional::make_expr<proto::tag:: mem_ptr> make_mem_ptr; } namespace rule { struct mem_ptr : expression:: mem_ptr<meta_grammar, meta_grammar> {}; } template <typename Dummy> struct meta_grammar::case_<proto::tag:: mem_ptr, Dummy> : enable_rule<rule:: mem_ptr, Dummy> {}; + namespace expression { template <typename Lhs, typename Rhs> struct mem_ptr : expr<proto::tag:: mem_ptr, Lhs, Rhs> {}; } namespace rule { struct mem_ptr : expression:: mem_ptr<meta_grammar, meta_grammar> {}; } template <typename Dummy> struct meta_grammar::case_<proto::tag:: mem_ptr, Dummy> : enable_rule<rule:: mem_ptr, Dummy> {}; namespace functional { typedef proto::functional::make_expr<proto::tag:: mem_ptr> make_mem_ptr; } namespace result_of { template <typename Lhs, typename Rhs> struct make_mem_ptr : boost::result_of< functional:: make_mem_ptr( Lhs, Rhs ) > {}; } template <typename Rhs, typename Lhs> inline typename result_of::make_mem_ptr<Rhs, Lhs>::type make_mem_ptr(Lhs const & lhs, Rhs const & rhs) { return functional::make_mem_ptr()(lhs, rhs); } template<> struct phoenix_generator::case_<proto::tag::mem_ptr> : proto::or_< diff --git a/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_20.hpp b/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_20.hpp index 50a8263..b3e5614 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_20.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_20.hpp @@ -7,7 +7,7 @@ ==============================================================================*/ namespace boost { namespace phoenix { - namespace expression { template <typename Lhs, typename Rhs> struct mem_ptr : expr<proto::tag:: mem_ptr, Lhs, Rhs> {}; typedef proto::functional::make_expr<proto::tag:: mem_ptr> make_mem_ptr; } namespace rule { struct mem_ptr : expression:: mem_ptr<meta_grammar, meta_grammar> {}; } template <typename Dummy> struct meta_grammar::case_<proto::tag:: mem_ptr, Dummy> : enable_rule<rule:: mem_ptr, Dummy> {}; + namespace expression { template <typename Lhs, typename Rhs> struct mem_ptr : expr<proto::tag:: mem_ptr, Lhs, Rhs> {}; } namespace rule { struct mem_ptr : expression:: mem_ptr<meta_grammar, meta_grammar> {}; } template <typename Dummy> struct meta_grammar::case_<proto::tag:: mem_ptr, Dummy> : enable_rule<rule:: mem_ptr, Dummy> {}; namespace functional { typedef proto::functional::make_expr<proto::tag:: mem_ptr> make_mem_ptr; } namespace result_of { template <typename Lhs, typename Rhs> struct make_mem_ptr : boost::result_of< functional:: make_mem_ptr( Lhs, Rhs ) > {}; } template <typename Rhs, typename Lhs> inline typename result_of::make_mem_ptr<Rhs, Lhs>::type make_mem_ptr(Lhs const & lhs, Rhs const & rhs) { return functional::make_mem_ptr()(lhs, rhs); } template<> struct phoenix_generator::case_<proto::tag::mem_ptr> : proto::or_< diff --git a/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_30.hpp b/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_30.hpp index be6ddf9..fa19cc3 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_30.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_30.hpp @@ -7,7 +7,7 @@ ==============================================================================*/ namespace boost { namespace phoenix { - namespace expression { template <typename Lhs, typename Rhs> struct mem_ptr : expr<proto::tag:: mem_ptr, Lhs, Rhs> {}; typedef proto::functional::make_expr<proto::tag:: mem_ptr> make_mem_ptr; } namespace rule { struct mem_ptr : expression:: mem_ptr<meta_grammar, meta_grammar> {}; } template <typename Dummy> struct meta_grammar::case_<proto::tag:: mem_ptr, Dummy> : enable_rule<rule:: mem_ptr, Dummy> {}; + namespace expression { template <typename Lhs, typename Rhs> struct mem_ptr : expr<proto::tag:: mem_ptr, Lhs, Rhs> {}; } namespace rule { struct mem_ptr : expression:: mem_ptr<meta_grammar, meta_grammar> {}; } template <typename Dummy> struct meta_grammar::case_<proto::tag:: mem_ptr, Dummy> : enable_rule<rule:: mem_ptr, Dummy> {}; namespace functional { typedef proto::functional::make_expr<proto::tag:: mem_ptr> make_mem_ptr; } namespace result_of { template <typename Lhs, typename Rhs> struct make_mem_ptr : boost::result_of< functional:: make_mem_ptr( Lhs, Rhs ) > {}; } template <typename Rhs, typename Lhs> inline typename result_of::make_mem_ptr<Rhs, Lhs>::type make_mem_ptr(Lhs const & lhs, Rhs const & rhs) { return functional::make_mem_ptr()(lhs, rhs); } template<> struct phoenix_generator::case_<proto::tag::mem_ptr> : proto::or_< diff --git a/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_40.hpp b/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_40.hpp index d03f0c9..f379a33 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_40.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_40.hpp @@ -7,7 +7,7 @@ ==============================================================================*/ namespace boost { namespace phoenix { - namespace expression { template <typename Lhs, typename Rhs> struct mem_ptr : expr<proto::tag:: mem_ptr, Lhs, Rhs> {}; typedef proto::functional::make_expr<proto::tag:: mem_ptr> make_mem_ptr; } namespace rule { struct mem_ptr : expression:: mem_ptr<meta_grammar, meta_grammar> {}; } template <typename Dummy> struct meta_grammar::case_<proto::tag:: mem_ptr, Dummy> : enable_rule<rule:: mem_ptr, Dummy> {}; + namespace expression { template <typename Lhs, typename Rhs> struct mem_ptr : expr<proto::tag:: mem_ptr, Lhs, Rhs> {}; } namespace rule { struct mem_ptr : expression:: mem_ptr<meta_grammar, meta_grammar> {}; } template <typename Dummy> struct meta_grammar::case_<proto::tag:: mem_ptr, Dummy> : enable_rule<rule:: mem_ptr, Dummy> {}; namespace functional { typedef proto::functional::make_expr<proto::tag:: mem_ptr> make_mem_ptr; } namespace result_of { template <typename Lhs, typename Rhs> struct make_mem_ptr : boost::result_of< functional:: make_mem_ptr( Lhs, Rhs ) > {}; } template <typename Rhs, typename Lhs> inline typename result_of::make_mem_ptr<Rhs, Lhs>::type make_mem_ptr(Lhs const & lhs, Rhs const & rhs) { return functional::make_mem_ptr()(lhs, rhs); } template<> struct phoenix_generator::case_<proto::tag::mem_ptr> : proto::or_< diff --git a/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_50.hpp b/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_50.hpp index bbaf2a4..58996ca 100644 --- a/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_50.hpp +++ b/3rdParty/Boost/src/boost/phoenix/operator/preprocessed/member_50.hpp @@ -7,7 +7,7 @@ ==============================================================================*/ namespace boost { namespace phoenix { - namespace expression { template <typename Lhs, typename Rhs> struct mem_ptr : expr<proto::tag:: mem_ptr, Lhs, Rhs> {}; typedef proto::functional::make_expr<proto::tag:: mem_ptr> make_mem_ptr; } namespace rule { struct mem_ptr : expression:: mem_ptr<meta_grammar, meta_grammar> {}; } template <typename Dummy> struct meta_grammar::case_<proto::tag:: mem_ptr, Dummy> : enable_rule<rule:: mem_ptr, Dummy> {}; + namespace expression { template <typename Lhs, typename Rhs> struct mem_ptr : expr<proto::tag:: mem_ptr, Lhs, Rhs> {}; } namespace rule { struct mem_ptr : expression:: mem_ptr<meta_grammar, meta_grammar> {}; } template <typename Dummy> struct meta_grammar::case_<proto::tag:: mem_ptr, Dummy> : enable_rule<rule:: mem_ptr, Dummy> {}; namespace functional { typedef proto::functional::make_expr<proto::tag:: mem_ptr> make_mem_ptr; } namespace result_of { template <typename Lhs, typename Rhs> struct make_mem_ptr : boost::result_of< functional:: make_mem_ptr( Lhs, Rhs ) > {}; } template <typename Rhs, typename Lhs> inline typename result_of::make_mem_ptr<Rhs, Lhs>::type make_mem_ptr(Lhs const & lhs, Rhs const & rhs) { return functional::make_mem_ptr()(lhs, rhs); } template<> struct phoenix_generator::case_<proto::tag::mem_ptr> : proto::or_< |