|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r71822 - in trunk: boost/phoenix/core boost/phoenix/core/detail/preprocessed boost/phoenix/object/detail/preprocessed boost/phoenix/operator/preprocessed boost/phoenix/scope boost/phoenix/scope/detail/preprocessed boost/phoenix/statement boost/phoenix/statement/detail boost/phoenix/statement/detail/preprocessed libs/phoenix/example
From: thom.heller_at_[hidden]
Date: 2011-05-08 10:58:24
Author: theller
Date: 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
New Revision: 71822
URL: http://svn.boost.org/trac/boost/changeset/71822
Log:
[phoenix] Fixed.
Text files modified:
trunk/boost/phoenix/core/as_actor.hpp | 1
trunk/boost/phoenix/core/detail/preprocessed/actor_result_of_10.hpp | 2
trunk/boost/phoenix/core/detail/preprocessed/call_10.hpp | 20 ++++----
trunk/boost/phoenix/core/function_equal.hpp | 3
trunk/boost/phoenix/core/limits.hpp | 40 +++-------------
trunk/boost/phoenix/object/detail/preprocessed/construct_eval_10.hpp | 18 +++---
trunk/boost/phoenix/object/detail/preprocessed/new_eval_10.hpp | 18 +++---
trunk/boost/phoenix/operator/preprocessed/member_10.hpp | 56 +++++++++++-----------
trunk/boost/phoenix/scope/detail/preprocessed/dynamic_10.hpp | 20 ++++----
trunk/boost/phoenix/scope/local_variable.hpp | 2
trunk/boost/phoenix/statement/detail/preprocessed/catch_push_back_10.hpp | 36 +++++++-------
trunk/boost/phoenix/statement/detail/preprocessed/switch_10.hpp | 90 ++++++++++++++++++------------------
trunk/boost/phoenix/statement/detail/preprocessed/try_catch_eval_10.hpp | 98 ++++++++++++++++++++--------------------
trunk/boost/phoenix/statement/detail/switch.hpp | 2
trunk/boost/phoenix/statement/switch.hpp | 2
trunk/libs/phoenix/example/parallel_for.cpp | 1
16 files changed, 195 insertions(+), 214 deletions(-)
Modified: trunk/boost/phoenix/core/as_actor.hpp
==============================================================================
--- trunk/boost/phoenix/core/as_actor.hpp (original)
+++ trunk/boost/phoenix/core/as_actor.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -8,6 +8,7 @@
#define BOOST_PHOENIX_CORE_AS_ACTOR_HPP
#include <boost/phoenix/core/actor.hpp>
+#include <boost/fusion/support/void.hpp>
namespace boost { namespace phoenix
{
Modified: trunk/boost/phoenix/core/detail/preprocessed/actor_result_of_10.hpp
==============================================================================
--- trunk/boost/phoenix/core/detail/preprocessed/actor_result_of_10.hpp (original)
+++ trunk/boost/phoenix/core/detail/preprocessed/actor_result_of_10.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -15,7 +15,7 @@
struct nullary_actor_result
{
typedef
- typename evaluator::impl<
+ typename boost::phoenix::evaluator::impl<
Expr const&
, vector2<
vector1<const ::boost::phoenix::actor<Expr> *> &
Modified: trunk/boost/phoenix/core/detail/preprocessed/call_10.hpp
==============================================================================
--- trunk/boost/phoenix/core/detail/preprocessed/call_10.hpp (original)
+++ trunk/boost/phoenix/core/detail/preprocessed/call_10.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -37,7 +37,7 @@
{
return
Fun()(
- proto::child_c<0>(e)
+ proto::child_c< 0>(e)
, boost::phoenix::context(s, d)
);
}
@@ -71,7 +71,7 @@
{
return
Fun()(
- proto::child_c<0>(e) , proto::child_c<1>(e)
+ proto::child_c< 0>(e) , proto::child_c< 1>(e)
, boost::phoenix::context(s, d)
);
}
@@ -105,7 +105,7 @@
{
return
Fun()(
- proto::child_c<0>(e) , proto::child_c<1>(e) , proto::child_c<2>(e)
+ proto::child_c< 0>(e) , proto::child_c< 1>(e) , proto::child_c< 2>(e)
, boost::phoenix::context(s, d)
);
}
@@ -139,7 +139,7 @@
{
return
Fun()(
- proto::child_c<0>(e) , proto::child_c<1>(e) , proto::child_c<2>(e) , proto::child_c<3>(e)
+ proto::child_c< 0>(e) , proto::child_c< 1>(e) , proto::child_c< 2>(e) , proto::child_c< 3>(e)
, boost::phoenix::context(s, d)
);
}
@@ -173,7 +173,7 @@
{
return
Fun()(
- proto::child_c<0>(e) , proto::child_c<1>(e) , proto::child_c<2>(e) , proto::child_c<3>(e) , proto::child_c<4>(e)
+ proto::child_c< 0>(e) , proto::child_c< 1>(e) , proto::child_c< 2>(e) , proto::child_c< 3>(e) , proto::child_c< 4>(e)
, boost::phoenix::context(s, d)
);
}
@@ -207,7 +207,7 @@
{
return
Fun()(
- proto::child_c<0>(e) , proto::child_c<1>(e) , proto::child_c<2>(e) , proto::child_c<3>(e) , proto::child_c<4>(e) , proto::child_c<5>(e)
+ proto::child_c< 0>(e) , proto::child_c< 1>(e) , proto::child_c< 2>(e) , proto::child_c< 3>(e) , proto::child_c< 4>(e) , proto::child_c< 5>(e)
, boost::phoenix::context(s, d)
);
}
@@ -241,7 +241,7 @@
{
return
Fun()(
- proto::child_c<0>(e) , proto::child_c<1>(e) , proto::child_c<2>(e) , proto::child_c<3>(e) , proto::child_c<4>(e) , proto::child_c<5>(e) , proto::child_c<6>(e)
+ proto::child_c< 0>(e) , proto::child_c< 1>(e) , proto::child_c< 2>(e) , proto::child_c< 3>(e) , proto::child_c< 4>(e) , proto::child_c< 5>(e) , proto::child_c< 6>(e)
, boost::phoenix::context(s, d)
);
}
@@ -275,7 +275,7 @@
{
return
Fun()(
- proto::child_c<0>(e) , proto::child_c<1>(e) , proto::child_c<2>(e) , proto::child_c<3>(e) , proto::child_c<4>(e) , proto::child_c<5>(e) , proto::child_c<6>(e) , proto::child_c<7>(e)
+ proto::child_c< 0>(e) , proto::child_c< 1>(e) , proto::child_c< 2>(e) , proto::child_c< 3>(e) , proto::child_c< 4>(e) , proto::child_c< 5>(e) , proto::child_c< 6>(e) , proto::child_c< 7>(e)
, boost::phoenix::context(s, d)
);
}
@@ -309,7 +309,7 @@
{
return
Fun()(
- proto::child_c<0>(e) , proto::child_c<1>(e) , proto::child_c<2>(e) , proto::child_c<3>(e) , proto::child_c<4>(e) , proto::child_c<5>(e) , proto::child_c<6>(e) , proto::child_c<7>(e) , proto::child_c<8>(e)
+ proto::child_c< 0>(e) , proto::child_c< 1>(e) , proto::child_c< 2>(e) , proto::child_c< 3>(e) , proto::child_c< 4>(e) , proto::child_c< 5>(e) , proto::child_c< 6>(e) , proto::child_c< 7>(e) , proto::child_c< 8>(e)
, boost::phoenix::context(s, d)
);
}
@@ -343,7 +343,7 @@
{
return
Fun()(
- proto::child_c<0>(e) , proto::child_c<1>(e) , proto::child_c<2>(e) , proto::child_c<3>(e) , proto::child_c<4>(e) , proto::child_c<5>(e) , proto::child_c<6>(e) , proto::child_c<7>(e) , proto::child_c<8>(e) , proto::child_c<9>(e)
+ proto::child_c< 0>(e) , proto::child_c< 1>(e) , proto::child_c< 2>(e) , proto::child_c< 3>(e) , proto::child_c< 4>(e) , proto::child_c< 5>(e) , proto::child_c< 6>(e) , proto::child_c< 7>(e) , proto::child_c< 8>(e) , proto::child_c< 9>(e)
, boost::phoenix::context(s, d)
);
}
Modified: trunk/boost/phoenix/core/function_equal.hpp
==============================================================================
--- trunk/boost/phoenix/core/function_equal.hpp (original)
+++ trunk/boost/phoenix/core/function_equal.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -8,6 +8,7 @@
#ifndef BOOST_PHOENIX_CORE_FUNCTION_EQUAL_HPP
#define BOOST_PHOENIX_CORE_FUNCTION_EQUAL_HPP
+#include <boost/preprocessor/arithmetic/inc.hpp>
#include <boost/phoenix/core/limits.hpp>
#include <boost/is_placeholder.hpp>
#include <boost/mpl/bool.hpp>
@@ -134,7 +135,7 @@
BOOST_PP_REPEAT_FROM_TO(
1
- , BOOST_PROTO_MAX_ARITY
+ , BOOST_PP_INC(BOOST_PROTO_MAX_ARITY)
, BOOST_PHOENIX_FUNCTION_EQUAL
, _
)
Modified: trunk/boost/phoenix/core/limits.hpp
==============================================================================
--- trunk/boost/phoenix/core/limits.hpp (original)
+++ trunk/boost/phoenix/core/limits.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -14,12 +14,15 @@
#include <boost/phoenix/version.hpp>
#include <boost/phoenix/support/preprocessor/round.hpp>
-#if !defined(BOOST_PHOENIX_LIMIT)
-# define BOOST_PHOENIX_LIMIT 10
-#elif (BOOST_PHOENIX_LIMIT < 5)
-# error "PHOENIX_LIMIT is set too low"
+
+#if defined(BOOST_PHOENIX_LIMIT)
+#define BOOST_PROTO_MAX_ARITY BOOST_PHOENIX_LIMIT
+#include <boost/proto/proto_fwd.hpp>
+#else
+#include <boost/proto/proto_fwd.hpp>
+#define BOOST_PHOENIX_LIMIT BOOST_PROTO_MAX_ARITY
#endif
-// for backwards compat.
+
#define PHOENIX_LIMIT BOOST_PHOENIX_LIMIT
#define BOOST_PHOENIX_LIMIT_STR BOOST_PP_STRINGIZE(BOOST_PHOENIX_PP_ROUND_UP(BOOST_PHOENIX_LIMIT))
@@ -94,31 +97,4 @@
# define BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES
#endif
-#if !defined(BOOST_PROTO_MAX_ARITY)
-# define BOOST_PROTO_MAX_ARITY BOOST_PP_INC(BOOST_PHOENIX_COMPOSITE_LIMIT)
-# if !defined(BOOST_MPL_LIMIT_METAFUNCTION_ARITY)
-# define BOOST_MPL_LIMIT_METAFUNCTION_ARITY BOOST_PP_INC(BOOST_PROTO_MAX_ARITY)
-//# define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-# elif BOOST_MPL_LIMIT_METAFUNCTION_ARITY < BOOST_PROTO_MAX_ARITY
-# error "BOOST_MPL_LIMIT_METAFUNCTION_ARITY < BOOST_PROTO_MAX_ARITY"
-# endif
-#elif (BOOST_PROTO_MAX_ARITY < BOOST_PHOENIX_COMPOSE_LIMIT)
-# error "BOOST_PROTO_MAX_ARITY < BOOST_PHOENIX_COMPOSITE_LIMIT"
-#endif
-
-#if !defined(BOOST_PROTO_MAX_LOGICAL_ARITY)
-# define BOOST_PROTO_MAX_LOGICAL_ARITY BOOST_PHOENIX_COMPOSITE_LIMIT
-#elif BOOST_PROTO_MAX_LOGICAL_ARITY < BOOST_PHOENIX_COMPOSITE_LIMIT
-# error "BOOST_PROTO_MAX_LOGICAL_ARITY < BOOST_PHOENIX_COMPOSITE_LIMIT"
-#endif
-
-//#if !defined(BOOST_RESULT_OF_NUM_ARGS)
-//# define BOOST_RESULT_OF_NUM_ARGS BOOST_PP_INC(BOOST_PHOENIX_COMPOSITE_LIMIT)
-//#elif BOOST_RESULT_OF_NUM_ARGS < BOOST_PP_INC(BOOST_PHOENIX_COMPOSITE_LIMIT)
-//# error "BOOST_RESULT_OF_NUM_ARGS < BOOST_PHOENIX_COMPOSITE_LIMIT + 1"
-//#endif
-
-// this include will set the limit for the proto expression arity
-#include <boost/proto/proto_fwd.hpp>
-
#endif
Modified: trunk/boost/phoenix/object/detail/preprocessed/construct_eval_10.hpp
==============================================================================
--- trunk/boost/phoenix/object/detail/preprocessed/construct_eval_10.hpp (original)
+++ trunk/boost/phoenix/object/detail/preprocessed/construct_eval_10.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -28,7 +28,7 @@
{
return
typename detail::result_of::target<A0>::type(
- eval(a1, ctx)
+ boost::phoenix::eval(a1, ctx)
);
}
@@ -54,7 +54,7 @@
{
return
typename detail::result_of::target<A0>::type(
- eval(a1, ctx) , eval(a2, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx)
);
}
@@ -80,7 +80,7 @@
{
return
typename detail::result_of::target<A0>::type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx)
);
}
@@ -106,7 +106,7 @@
{
return
typename detail::result_of::target<A0>::type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx)
);
}
@@ -132,7 +132,7 @@
{
return
typename detail::result_of::target<A0>::type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx)
);
}
@@ -158,7 +158,7 @@
{
return
typename detail::result_of::target<A0>::type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx) , eval(a6, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx) , boost::phoenix::eval(a6, ctx)
);
}
@@ -184,7 +184,7 @@
{
return
typename detail::result_of::target<A0>::type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx) , eval(a6, ctx) , eval(a7, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx) , boost::phoenix::eval(a6, ctx) , boost::phoenix::eval(a7, ctx)
);
}
@@ -210,7 +210,7 @@
{
return
typename detail::result_of::target<A0>::type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx) , eval(a6, ctx) , eval(a7, ctx) , eval(a8, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx) , boost::phoenix::eval(a6, ctx) , boost::phoenix::eval(a7, ctx) , boost::phoenix::eval(a8, ctx)
);
}
@@ -236,6 +236,6 @@
{
return
typename detail::result_of::target<A0>::type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx) , eval(a6, ctx) , eval(a7, ctx) , eval(a8, ctx) , eval(a9, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx) , boost::phoenix::eval(a6, ctx) , boost::phoenix::eval(a7, ctx) , boost::phoenix::eval(a8, ctx) , boost::phoenix::eval(a9, ctx)
);
}
Modified: trunk/boost/phoenix/object/detail/preprocessed/new_eval_10.hpp
==============================================================================
--- trunk/boost/phoenix/object/detail/preprocessed/new_eval_10.hpp (original)
+++ trunk/boost/phoenix/object/detail/preprocessed/new_eval_10.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -35,7 +35,7 @@
new typename result<
new_eval(A0 const& , A1 const&, Context &)
>::construct_type(
- eval(a1, ctx)
+ boost::phoenix::eval(a1, ctx)
);
}
@@ -68,7 +68,7 @@
new typename result<
new_eval(A0 const& , A1 const& , A2 const&, Context &)
>::construct_type(
- eval(a1, ctx) , eval(a2, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx)
);
}
@@ -101,7 +101,7 @@
new typename result<
new_eval(A0 const& , A1 const& , A2 const& , A3 const&, Context &)
>::construct_type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx)
);
}
@@ -134,7 +134,7 @@
new typename result<
new_eval(A0 const& , A1 const& , A2 const& , A3 const& , A4 const&, Context &)
>::construct_type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx)
);
}
@@ -167,7 +167,7 @@
new typename result<
new_eval(A0 const& , A1 const& , A2 const& , A3 const& , A4 const& , A5 const&, Context &)
>::construct_type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx)
);
}
@@ -200,7 +200,7 @@
new typename result<
new_eval(A0 const& , A1 const& , A2 const& , A3 const& , A4 const& , A5 const& , A6 const&, Context &)
>::construct_type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx) , eval(a6, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx) , boost::phoenix::eval(a6, ctx)
);
}
@@ -233,7 +233,7 @@
new typename result<
new_eval(A0 const& , A1 const& , A2 const& , A3 const& , A4 const& , A5 const& , A6 const& , A7 const&, Context &)
>::construct_type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx) , eval(a6, ctx) , eval(a7, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx) , boost::phoenix::eval(a6, ctx) , boost::phoenix::eval(a7, ctx)
);
}
@@ -266,7 +266,7 @@
new typename result<
new_eval(A0 const& , A1 const& , A2 const& , A3 const& , A4 const& , A5 const& , A6 const& , A7 const& , A8 const&, Context &)
>::construct_type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx) , eval(a6, ctx) , eval(a7, ctx) , eval(a8, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx) , boost::phoenix::eval(a6, ctx) , boost::phoenix::eval(a7, ctx) , boost::phoenix::eval(a8, ctx)
);
}
@@ -299,6 +299,6 @@
new typename result<
new_eval(A0 const& , A1 const& , A2 const& , A3 const& , A4 const& , A5 const& , A6 const& , A7 const& , A8 const& , A9 const&, Context &)
>::construct_type(
- eval(a1, ctx) , eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx) , eval(a6, ctx) , eval(a7, ctx) , eval(a8, ctx) , eval(a9, ctx)
+ boost::phoenix::eval(a1, ctx) , boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx) , boost::phoenix::eval(a6, ctx) , boost::phoenix::eval(a7, ctx) , boost::phoenix::eval(a8, ctx) , boost::phoenix::eval(a9, ctx)
);
}
Modified: trunk/boost/phoenix/operator/preprocessed/member_10.hpp
==============================================================================
--- trunk/boost/phoenix/operator/preprocessed/member_10.hpp (original)
+++ trunk/boost/phoenix/operator/preprocessed/member_10.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -5,10 +5,10 @@
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
-namespace boost { namespace phoenix { namespace tag { struct mem_fun_ptr {}; template <typename Ostream> inline Ostream &operator<<( Ostream & os , mem_fun_ptr) { os << "mem_fun_ptr"; return os; } } namespace expression { template < typename A0 = void , typename A1 = void , typename A2 = void , typename A3 = void , typename A4 = void , typename A5 = void , typename A6 = void , typename A7 = void , typename A8 = void , typename A9 = void , typename Dummy = void > struct mem_fun_ptr; template < typename A0 > struct mem_fun_ptr< A0 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 > {}; template < typename A0 , typename A1 > struct mem_fun_ptr< A0 , A1 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 > {}; template < typename A0 , typename A1 , typename A2 > struct mem_fun_ptr< A0 , A1 , A2 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 , A2 > {}; template < typename A0 , typename A1 , typename A2 , typename A3 > struct mem_fun_ptr< A0 , A1 , A2 , A3 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0
, A1 , A2 , A3 > {}; template < typename A0 , typename A1 , typename A2 , typename A3 , typename A4 > struct mem_fun_ptr< A0 , A1 , A2 , A3 , A4 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 , A2 , A3 , A4 > {}; template < typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 > struct mem_fun_ptr< A0 , A1 , A2 , A3 , A4 , A5 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 , A2 , A3 , A4 , A5 > {}; template < typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 > struct mem_fun_ptr< A0 , A1 , A2 , A3 , A4 , A5 , A6 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 , A2 , A3 , A4 , A5 , A6 > {}; template < typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 > struct mem_fun_ptr< A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 > {}; template < typename A0 , typename A1 , typename A2 , typename
A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 > struct mem_fun_ptr< A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 > {}; } namespace rule { struct mem_fun_ptr : expression:: mem_fun_ptr < proto::vararg< meta_grammar > > {}; } } } namespace boost { namespace phoenix { template <typename Dummy> struct meta_grammar::case_< boost :: phoenix :: tag:: mem_fun_ptr , Dummy > : enable_rule< boost :: phoenix :: rule:: mem_fun_ptr , Dummy > {}; } }
+namespace boost { namespace phoenix { namespace tag { struct mem_fun_ptr {}; template <typename Ostream> inline Ostream &operator<<( Ostream & os , mem_fun_ptr) { os << "mem_fun_ptr"; return os; } } namespace expression { template < typename A0 = void , typename A1 = void , typename A2 = void , typename A3 = void , typename A4 = void , typename A5 = void , typename A6 = void , typename A7 = void , typename A8 = void , typename A9 = void , typename Dummy = void > struct mem_fun_ptr; template < typename A0 > struct mem_fun_ptr< A0 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 > {}; template < typename A0 , typename A1 > struct mem_fun_ptr< A0 , A1 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 > {}; template < typename A0 , typename A1 , typename A2 > struct mem_fun_ptr< A0 , A1 , A2 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 , A2 > {}; template < typename A0 , typename A1 , typename A2 , typename A3 > struct mem_fun_ptr< A0 , A1 , A2 , A3 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0
, A1 , A2 , A3 > {}; template < typename A0 , typename A1 , typename A2 , typename A3 , typename A4 > struct mem_fun_ptr< A0 , A1 , A2 , A3 , A4 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 , A2 , A3 , A4 > {}; template < typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 > struct mem_fun_ptr< A0 , A1 , A2 , A3 , A4 , A5 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 , A2 , A3 , A4 , A5 > {}; template < typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 > struct mem_fun_ptr< A0 , A1 , A2 , A3 , A4 , A5 , A6 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 , A2 , A3 , A4 , A5 , A6 > {}; template < typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 > struct mem_fun_ptr< A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 > {}; template < typename A0 , typename A1 , typename A2 , typename
A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 > struct mem_fun_ptr< A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 > : boost::phoenix::expr< tag:: mem_fun_ptr , A0 , A1 , A2 , A3 , A4 , A5 , A6 , A7 , A8 > {}; } namespace rule { struct mem_fun_ptr : expression:: mem_fun_ptr < proto::vararg< meta_grammar > > {}; } } } namespace boost { namespace phoenix { template <typename Dummy> struct meta_grammar::case_< :: boost :: phoenix :: tag:: mem_fun_ptr , Dummy > : enable_rule< :: boost :: phoenix :: rule:: mem_fun_ptr , Dummy > {}; } }
namespace boost { namespace phoenix
{
- 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 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> {};
template <typename Object, typename MemPtr>
inline
typename enable_if<
@@ -228,8 +228,8 @@
{
return
(
- get_pointer(eval(a0, ctx))
- ->*eval(a1, ctx)
+ get_pointer(boost::phoenix::eval(a0, ctx))
+ ->*boost::phoenix::eval(a1, ctx)
)(
);
@@ -259,10 +259,10 @@
{
return
(
- get_pointer(eval(a0, ctx))
- ->*eval(a1, ctx)
+ get_pointer(boost::phoenix::eval(a0, ctx))
+ ->*boost::phoenix::eval(a1, ctx)
)(
- eval(a2, ctx)
+ boost::phoenix::eval(a2, ctx)
);
}
@@ -290,10 +290,10 @@
{
return
(
- get_pointer(eval(a0, ctx))
- ->*eval(a1, ctx)
+ get_pointer(boost::phoenix::eval(a0, ctx))
+ ->*boost::phoenix::eval(a1, ctx)
)(
- eval(a2, ctx) , eval(a3, ctx)
+ boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx)
);
}
@@ -321,10 +321,10 @@
{
return
(
- get_pointer(eval(a0, ctx))
- ->*eval(a1, ctx)
+ get_pointer(boost::phoenix::eval(a0, ctx))
+ ->*boost::phoenix::eval(a1, ctx)
)(
- eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx)
+ boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx)
);
}
@@ -352,10 +352,10 @@
{
return
(
- get_pointer(eval(a0, ctx))
- ->*eval(a1, ctx)
+ get_pointer(boost::phoenix::eval(a0, ctx))
+ ->*boost::phoenix::eval(a1, ctx)
)(
- eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx)
+ boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx)
);
}
@@ -383,10 +383,10 @@
{
return
(
- get_pointer(eval(a0, ctx))
- ->*eval(a1, ctx)
+ get_pointer(boost::phoenix::eval(a0, ctx))
+ ->*boost::phoenix::eval(a1, ctx)
)(
- eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx) , eval(a6, ctx)
+ boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx) , boost::phoenix::eval(a6, ctx)
);
}
@@ -414,10 +414,10 @@
{
return
(
- get_pointer(eval(a0, ctx))
- ->*eval(a1, ctx)
+ get_pointer(boost::phoenix::eval(a0, ctx))
+ ->*boost::phoenix::eval(a1, ctx)
)(
- eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx) , eval(a6, ctx) , eval(a7, ctx)
+ boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx) , boost::phoenix::eval(a6, ctx) , boost::phoenix::eval(a7, ctx)
);
}
@@ -445,10 +445,10 @@
{
return
(
- get_pointer(eval(a0, ctx))
- ->*eval(a1, ctx)
+ get_pointer(boost::phoenix::eval(a0, ctx))
+ ->*boost::phoenix::eval(a1, ctx)
)(
- eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx) , eval(a6, ctx) , eval(a7, ctx) , eval(a8, ctx)
+ boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx) , boost::phoenix::eval(a6, ctx) , boost::phoenix::eval(a7, ctx) , boost::phoenix::eval(a8, ctx)
);
}
@@ -476,10 +476,10 @@
{
return
(
- get_pointer(eval(a0, ctx))
- ->*eval(a1, ctx)
+ get_pointer(boost::phoenix::eval(a0, ctx))
+ ->*boost::phoenix::eval(a1, ctx)
)(
- eval(a2, ctx) , eval(a3, ctx) , eval(a4, ctx) , eval(a5, ctx) , eval(a6, ctx) , eval(a7, ctx) , eval(a8, ctx) , eval(a9, ctx)
+ boost::phoenix::eval(a2, ctx) , boost::phoenix::eval(a3, ctx) , boost::phoenix::eval(a4, ctx) , boost::phoenix::eval(a5, ctx) , boost::phoenix::eval(a6, ctx) , boost::phoenix::eval(a7, ctx) , boost::phoenix::eval(a8, ctx) , boost::phoenix::eval(a9, ctx)
);
}
Modified: trunk/boost/phoenix/scope/detail/preprocessed/dynamic_10.hpp
==============================================================================
--- trunk/boost/phoenix/scope/detail/preprocessed/dynamic_10.hpp (original)
+++ trunk/boost/phoenix/scope/detail/preprocessed/dynamic_10.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -36,7 +36,7 @@
dynamic_member<mpl::int_<N>, self_type *>::
make(mpl::int_<N>(), scope);
}
- typedef typename expression::dynamic_member< mpl::int_<0> , self_type * >::type member1;
+ typedef typename expression::dynamic_member< mpl::int_< 0> , self_type * >::type member1;
mutable dynamic_frame_type* frame;
};
@@ -70,7 +70,7 @@
dynamic_member<mpl::int_<N>, self_type *>::
make(mpl::int_<N>(), scope);
}
- typedef typename expression::dynamic_member< mpl::int_<0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_<1> , self_type * >::type member2;
+ typedef typename expression::dynamic_member< mpl::int_< 0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_< 1> , self_type * >::type member2;
mutable dynamic_frame_type* frame;
};
@@ -104,7 +104,7 @@
dynamic_member<mpl::int_<N>, self_type *>::
make(mpl::int_<N>(), scope);
}
- typedef typename expression::dynamic_member< mpl::int_<0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_<1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_<2> , self_type * >::type member3;
+ typedef typename expression::dynamic_member< mpl::int_< 0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_< 1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_< 2> , self_type * >::type member3;
mutable dynamic_frame_type* frame;
};
@@ -138,7 +138,7 @@
dynamic_member<mpl::int_<N>, self_type *>::
make(mpl::int_<N>(), scope);
}
- typedef typename expression::dynamic_member< mpl::int_<0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_<1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_<2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_<3> , self_type * >::type member4;
+ typedef typename expression::dynamic_member< mpl::int_< 0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_< 1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_< 2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_< 3> , self_type * >::type member4;
mutable dynamic_frame_type* frame;
};
@@ -172,7 +172,7 @@
dynamic_member<mpl::int_<N>, self_type *>::
make(mpl::int_<N>(), scope);
}
- typedef typename expression::dynamic_member< mpl::int_<0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_<1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_<2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_<3> , self_type * >::type member4; typedef typename expression::dynamic_member< mpl::int_<4> , self_type * >::type member5;
+ typedef typename expression::dynamic_member< mpl::int_< 0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_< 1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_< 2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_< 3> , self_type * >::type member4; typedef typename expression::dynamic_member< mpl::int_< 4> , self_type * >::type member5;
mutable dynamic_frame_type* frame;
};
@@ -206,7 +206,7 @@
dynamic_member<mpl::int_<N>, self_type *>::
make(mpl::int_<N>(), scope);
}
- typedef typename expression::dynamic_member< mpl::int_<0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_<1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_<2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_<3> , self_type * >::type member4; typedef typename expression::dynamic_member< mpl::int_<4> , self_type * >::type member5; typedef typename expression::dynamic_member< mpl::int_<5> , self_type * >::type member6;
+ typedef typename expression::dynamic_member< mpl::int_< 0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_< 1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_< 2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_< 3> , self_type * >::type member4; typedef typename expression::dynamic_member< mpl::int_< 4> , self_type * >::type member5; typedef typename expression::dynamic_member< mpl::int_< 5> , self_type * >::type member6;
mutable dynamic_frame_type* frame;
};
@@ -240,7 +240,7 @@
dynamic_member<mpl::int_<N>, self_type *>::
make(mpl::int_<N>(), scope);
}
- typedef typename expression::dynamic_member< mpl::int_<0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_<1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_<2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_<3> , self_type * >::type member4; typedef typename expression::dynamic_member< mpl::int_<4> , self_type * >::type member5; typedef typename expression::dynamic_member< mpl::int_<5> , self_type * >::type member6; typedef typename expression::dynamic_member< mpl::int_<6> , self_type * >::type member7;
+ typedef typename expression::dynamic_member< mpl::int_< 0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_< 1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_< 2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_< 3> , self_type * >::type member4; typedef typename expression::dynamic_member< mpl::int_< 4> , self_type * >::type member5; typedef typename expression::dynamic_member< mpl::int_< 5> , self_type * >::type member6; typedef typename expression::dynamic_member< mpl::int_< 6> , self_type * >::type member7;
mutable dynamic_frame_type* frame;
};
@@ -274,7 +274,7 @@
dynamic_member<mpl::int_<N>, self_type *>::
make(mpl::int_<N>(), scope);
}
- typedef typename expression::dynamic_member< mpl::int_<0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_<1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_<2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_<3> , self_type * >::type member4; typedef typename expression::dynamic_member< mpl::int_<4> , self_type * >::type member5; typedef typename expression::dynamic_member< mpl::int_<5> , self_type * >::type member6; typedef typename expression::dynamic_member< mpl::int_<6> , self_type * >::type member7; typedef typename expression::dynamic_member< mpl::int_<7> , self_type * >::type member8;
+ typedef typename expression::dynamic_member< mpl::int_< 0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_< 1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_< 2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_< 3> , self_type * >::type member4; typedef typename expression::dynamic_member< mpl::int_< 4> , self_type * >::type member5; typedef typename expression::dynamic_member< mpl::int_< 5> , self_type * >::type member6; typedef typename expression::dynamic_member< mpl::int_< 6> , self_type * >::type member7; typedef typename expression::dynamic_member< mpl::int_< 7> , self_type * >::type member8;
mutable dynamic_frame_type* frame;
};
@@ -308,7 +308,7 @@
dynamic_member<mpl::int_<N>, self_type *>::
make(mpl::int_<N>(), scope);
}
- typedef typename expression::dynamic_member< mpl::int_<0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_<1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_<2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_<3> , self_type * >::type member4; typedef typename expression::dynamic_member< mpl::int_<4> , self_type * >::type member5; typedef typename expression::dynamic_member< mpl::int_<5> , self_type * >::type member6; typedef typename expression::dynamic_member< mpl::int_<6> , self_type * >::type member7; typedef typename expression::dynamic_member< mpl::int_<7> , self_type * >::type member8; typedef typename expression::dynamic_member< mpl::int_<8> , self_type * >::type member9;
+ typedef typename expression::dynamic_member< mpl::int_< 0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_< 1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_< 2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_< 3> , self_type * >::type member4; typedef typename expression::dynamic_member< mpl::int_< 4> , self_type * >::type member5; typedef typename expression::dynamic_member< mpl::int_< 5> , self_type * >::type member6; typedef typename expression::dynamic_member< mpl::int_< 6> , self_type * >::type member7; typedef typename expression::dynamic_member< mpl::int_< 7> , self_type * >::type member8; typedef typename expression::dynamic_member< mpl::int_< 8> , self_type * >::type member9;
mutable dynamic_frame_type* frame;
};
@@ -342,6 +342,6 @@
dynamic_member<mpl::int_<N>, self_type *>::
make(mpl::int_<N>(), scope);
}
- typedef typename expression::dynamic_member< mpl::int_<0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_<1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_<2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_<3> , self_type * >::type member4; typedef typename expression::dynamic_member< mpl::int_<4> , self_type * >::type member5; typedef typename expression::dynamic_member< mpl::int_<5> , self_type * >::type member6; typedef typename expression::dynamic_member< mpl::int_<6> , self_type * >::type member7; typedef typename expression::dynamic_member< mpl::int_<7> , self_type * >::type member8; typedef typename expression::dynamic_member< mpl::int_<8> , self_type * >::type member9; typedef typename expression::dynamic_member< mpl::int_<9> , self_type * >::type member10;
+ typedef typename expression::dynamic_member< mpl::int_< 0> , self_type * >::type member1; typedef typename expression::dynamic_member< mpl::int_< 1> , self_type * >::type member2; typedef typename expression::dynamic_member< mpl::int_< 2> , self_type * >::type member3; typedef typename expression::dynamic_member< mpl::int_< 3> , self_type * >::type member4; typedef typename expression::dynamic_member< mpl::int_< 4> , self_type * >::type member5; typedef typename expression::dynamic_member< mpl::int_< 5> , self_type * >::type member6; typedef typename expression::dynamic_member< mpl::int_< 6> , self_type * >::type member7; typedef typename expression::dynamic_member< mpl::int_< 7> , self_type * >::type member8; typedef typename expression::dynamic_member< mpl::int_< 8> , self_type * >::type member9; typedef typename expression::dynamic_member< mpl::int_< 9> , self_type * >::type member10;
mutable dynamic_frame_type* frame;
};
Modified: trunk/boost/phoenix/scope/local_variable.hpp
==============================================================================
--- trunk/boost/phoenix/scope/local_variable.hpp (original)
+++ trunk/boost/phoenix/scope/local_variable.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -11,6 +11,8 @@
#include <boost/phoenix/core/limits.hpp>
#include <boost/fusion/container/map.hpp>
#include <boost/fusion/container/generation/make_map.hpp>
+#include <boost/fusion/sequence/intrinsic/at_key.hpp>
+#include <boost/fusion/sequence/intrinsic/has_key.hpp>
#include <boost/phoenix/core/call.hpp>
#include <boost/phoenix/core/expression.hpp>
#include <boost/phoenix/core/reference.hpp>
Modified: trunk/boost/phoenix/statement/detail/preprocessed/catch_push_back_10.hpp
==============================================================================
--- trunk/boost/phoenix/statement/detail/preprocessed/catch_push_back_10.hpp (original)
+++ trunk/boost/phoenix/statement/detail/preprocessed/catch_push_back_10.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -35,7 +35,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch)
, proto::make_expr<
phoenix::tag::catch_
, default_domain_with_basic_expr
@@ -66,7 +66,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch)
, proto::make_expr<
phoenix::tag::catch_all
, default_domain_with_basic_expr
@@ -104,7 +104,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch)
, proto::make_expr<
phoenix::tag::catch_
, default_domain_with_basic_expr
@@ -135,7 +135,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch)
, proto::make_expr<
phoenix::tag::catch_all
, default_domain_with_basic_expr
@@ -173,7 +173,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch)
, proto::make_expr<
phoenix::tag::catch_
, default_domain_with_basic_expr
@@ -204,7 +204,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch)
, proto::make_expr<
phoenix::tag::catch_all
, default_domain_with_basic_expr
@@ -242,7 +242,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch) , proto::child_c<4>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch) , proto::child_c< 4>(try_catch)
, proto::make_expr<
phoenix::tag::catch_
, default_domain_with_basic_expr
@@ -273,7 +273,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch) , proto::child_c<4>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch) , proto::child_c< 4>(try_catch)
, proto::make_expr<
phoenix::tag::catch_all
, default_domain_with_basic_expr
@@ -311,7 +311,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch) , proto::child_c<4>(try_catch) , proto::child_c<5>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch) , proto::child_c< 4>(try_catch) , proto::child_c< 5>(try_catch)
, proto::make_expr<
phoenix::tag::catch_
, default_domain_with_basic_expr
@@ -342,7 +342,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch) , proto::child_c<4>(try_catch) , proto::child_c<5>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch) , proto::child_c< 4>(try_catch) , proto::child_c< 5>(try_catch)
, proto::make_expr<
phoenix::tag::catch_all
, default_domain_with_basic_expr
@@ -380,7 +380,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch) , proto::child_c<4>(try_catch) , proto::child_c<5>(try_catch) , proto::child_c<6>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch) , proto::child_c< 4>(try_catch) , proto::child_c< 5>(try_catch) , proto::child_c< 6>(try_catch)
, proto::make_expr<
phoenix::tag::catch_
, default_domain_with_basic_expr
@@ -411,7 +411,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch) , proto::child_c<4>(try_catch) , proto::child_c<5>(try_catch) , proto::child_c<6>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch) , proto::child_c< 4>(try_catch) , proto::child_c< 5>(try_catch) , proto::child_c< 6>(try_catch)
, proto::make_expr<
phoenix::tag::catch_all
, default_domain_with_basic_expr
@@ -449,7 +449,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch) , proto::child_c<4>(try_catch) , proto::child_c<5>(try_catch) , proto::child_c<6>(try_catch) , proto::child_c<7>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch) , proto::child_c< 4>(try_catch) , proto::child_c< 5>(try_catch) , proto::child_c< 6>(try_catch) , proto::child_c< 7>(try_catch)
, proto::make_expr<
phoenix::tag::catch_
, default_domain_with_basic_expr
@@ -480,7 +480,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch) , proto::child_c<4>(try_catch) , proto::child_c<5>(try_catch) , proto::child_c<6>(try_catch) , proto::child_c<7>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch) , proto::child_c< 4>(try_catch) , proto::child_c< 5>(try_catch) , proto::child_c< 6>(try_catch) , proto::child_c< 7>(try_catch)
, proto::make_expr<
phoenix::tag::catch_all
, default_domain_with_basic_expr
@@ -518,7 +518,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch) , proto::child_c<4>(try_catch) , proto::child_c<5>(try_catch) , proto::child_c<6>(try_catch) , proto::child_c<7>(try_catch) , proto::child_c<8>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch) , proto::child_c< 4>(try_catch) , proto::child_c< 5>(try_catch) , proto::child_c< 6>(try_catch) , proto::child_c< 7>(try_catch) , proto::child_c< 8>(try_catch)
, proto::make_expr<
phoenix::tag::catch_
, default_domain_with_basic_expr
@@ -549,7 +549,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch) , proto::child_c<4>(try_catch) , proto::child_c<5>(try_catch) , proto::child_c<6>(try_catch) , proto::child_c<7>(try_catch) , proto::child_c<8>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch) , proto::child_c< 4>(try_catch) , proto::child_c< 5>(try_catch) , proto::child_c< 6>(try_catch) , proto::child_c< 7>(try_catch) , proto::child_c< 8>(try_catch)
, proto::make_expr<
phoenix::tag::catch_all
, default_domain_with_basic_expr
@@ -587,7 +587,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch) , proto::child_c<4>(try_catch) , proto::child_c<5>(try_catch) , proto::child_c<6>(try_catch) , proto::child_c<7>(try_catch) , proto::child_c<8>(try_catch) , proto::child_c<9>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch) , proto::child_c< 4>(try_catch) , proto::child_c< 5>(try_catch) , proto::child_c< 6>(try_catch) , proto::child_c< 7>(try_catch) , proto::child_c< 8>(try_catch) , proto::child_c< 9>(try_catch)
, proto::make_expr<
phoenix::tag::catch_
, default_domain_with_basic_expr
@@ -618,7 +618,7 @@
{
return
gen_type::make(
- proto::child_c<0>(try_catch) , proto::child_c<1>(try_catch) , proto::child_c<2>(try_catch) , proto::child_c<3>(try_catch) , proto::child_c<4>(try_catch) , proto::child_c<5>(try_catch) , proto::child_c<6>(try_catch) , proto::child_c<7>(try_catch) , proto::child_c<8>(try_catch) , proto::child_c<9>(try_catch)
+ proto::child_c< 0>(try_catch) , proto::child_c< 1>(try_catch) , proto::child_c< 2>(try_catch) , proto::child_c< 3>(try_catch) , proto::child_c< 4>(try_catch) , proto::child_c< 5>(try_catch) , proto::child_c< 6>(try_catch) , proto::child_c< 7>(try_catch) , proto::child_c< 8>(try_catch) , proto::child_c< 9>(try_catch)
, proto::make_expr<
phoenix::tag::catch_all
, default_domain_with_basic_expr
Modified: trunk/boost/phoenix/statement/detail/preprocessed/switch_10.hpp
==============================================================================
--- trunk/boost/phoenix/statement/detail/preprocessed/switch_10.hpp (original)
+++ trunk/boost/phoenix/statement/detail/preprocessed/switch_10.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -30,9 +30,9 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break;
}
}
template <typename Context, typename Cond, typename Cases>
@@ -53,11 +53,11 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break;
default:
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
fusion::deref(
fusion::advance_c<
@@ -94,9 +94,9 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break;
}
}
template <typename Context, typename Cond, typename Cases>
@@ -117,11 +117,11 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break;
default:
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
fusion::deref(
fusion::advance_c<
@@ -158,9 +158,9 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 3 >::type >::type case3; typedef typename proto::detail::
uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case3 , 0 >::type >::type >::type case_label3;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<3>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 3>(fusion::begin(flat_view)) ) ) , ctx ); break;
}
}
template <typename Context, typename Cond, typename Cases>
@@ -181,11 +181,11 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break;
default:
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
fusion::deref(
fusion::advance_c<
@@ -222,9 +222,9 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 3 >::type >::type case3; typedef typename proto::detail::
uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case3 , 0 >::type >::type >::type case_label3; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 4 >::type >::type case4; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case4 , 0 >::type >::type >::type case_label4;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<4>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 4>(fusion::begin(flat_view)) ) ) , ctx ); break;
}
}
template <typename Context, typename Cond, typename Cases>
@@ -245,11 +245,11 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 3 >::type >::type case3; typedef typename proto::detail::
uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case3 , 0 >::type >::type >::type case_label3;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<3>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 3>(fusion::begin(flat_view)) ) ) , ctx ); break;
default:
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
fusion::deref(
fusion::advance_c<
@@ -286,9 +286,9 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 3 >::type >::type case3; typedef typename proto::detail::
uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case3 , 0 >::type >::type >::type case_label3; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 4 >::type >::type case4; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case4 , 0 >::type >::type >::type case_label4; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 5 >::type >::type case5; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case5 , 0 >::type >::type >::type case_label5;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<5>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 5>(fusion::begin(flat_view)) ) ) , ctx ); break;
}
}
template <typename Context, typename Cond, typename Cases>
@@ -309,11 +309,11 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 3 >::type >::type case3; typedef typename proto::detail::
uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case3 , 0 >::type >::type >::type case_label3; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 4 >::type >::type case4; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case4 , 0 >::type >::type >::type case_label4;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<4>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 4>(fusion::begin(flat_view)) ) ) , ctx ); break;
default:
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
fusion::deref(
fusion::advance_c<
@@ -350,9 +350,9 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 3 >::type >::type case3; typedef typename proto::detail::
uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case3 , 0 >::type >::type >::type case_label3; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 4 >::type >::type case4; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case4 , 0 >::type >::type >::type case_label4; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 5 >::type >::type case5; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case5 , 0 >::type >::type >::type case_label5; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 6 >::type >::type case6; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case6 , 0 >::type >::type >::type case_label6;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<6>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 6
>(fusion::begin(flat_view)) ) ) , ctx ); break;
}
}
template <typename Context, typename Cond, typename Cases>
@@ -373,11 +373,11 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 3 >::type >::type case3; typedef typename proto::detail::
uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case3 , 0 >::type >::type >::type case_label3; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 4 >::type >::type case4; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case4 , 0 >::type >::type >::type case_label4; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 5 >::type >::type case5; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case5 , 0 >::type >::type >::type case_label5;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<5>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 5>(fusion::begin(flat_view)) ) ) , ctx ); break;
default:
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
fusion::deref(
fusion::advance_c<
@@ -414,9 +414,9 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 3 >::type >::type case3; typedef typename proto::detail::
uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case3 , 0 >::type >::type >::type case_label3; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 4 >::type >::type case4; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case4 , 0 >::type >::type >::type case_label4; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 5 >::type >::type case5; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case5 , 0 >::type >::type >::type case_label5; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 6 >::type >::type case6; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case6 , 0 >::type >::type >::type case_label6; typedef typename fusion::result_of::deref< typen
ame fusion::result_of::advance_c< flat_view_begin , 7 >::type >::type case7; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case7 , 0 >::type >::type >::type case_label7;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<6>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label7::value : eval( proto::child_c<1>( fusion::deref( fusio
n::advance_c<7>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 6
>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label7::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 7>(fusion::begin(flat_view)) ) ) , ctx ); break;
}
}
template <typename Context, typename Cond, typename Cases>
@@ -437,11 +437,11 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 3 >::type >::type case3; typedef typename proto::detail::
uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case3 , 0 >::type >::type >::type case_label3; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 4 >::type >::type case4; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case4 , 0 >::type >::type >::type case_label4; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 5 >::type >::type case5; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case5 , 0 >::type >::type >::type case_label5; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 6 >::type >::type case6; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case6 , 0 >::type >::type >::type case_label6;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<6>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 6
>(fusion::begin(flat_view)) ) ) , ctx ); break;
default:
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
fusion::deref(
fusion::advance_c<
@@ -478,9 +478,9 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 3 >::type >::type case3; typedef typename proto::detail::
uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case3 , 0 >::type >::type >::type case_label3; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 4 >::type >::type case4; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case4 , 0 >::type >::type >::type case_label4; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 5 >::type >::type case5; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case5 , 0 >::type >::type >::type case_label5; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 6 >::type >::type case6; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case6 , 0 >::type >::type >::type case_label6; typedef typename fusion::result_of::deref< typen
ame fusion::result_of::advance_c< flat_view_begin , 7 >::type >::type case7; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case7 , 0 >::type >::type >::type case_label7; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 8 >::type >::type case8; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case8 , 0 >::type >::type >::type case_label8;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<6>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label7::value : eval( proto::child_c<1>( fusion::deref( fusio
n::advance_c<7>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label8::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<8>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 6
>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label7::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 7>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label8::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 8>(fusion::begin(flat_view)) ) ) , ctx ); break;
}
}
template <typename Context, typename Cond, typename Cases>
@@ -501,11 +501,11 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 3 >::type >::type case3; typedef typename proto::detail::
uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case3 , 0 >::type >::type >::type case_label3; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 4 >::type >::type case4; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case4 , 0 >::type >::type >::type case_label4; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 5 >::type >::type case5; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case5 , 0 >::type >::type >::type case_label5; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 6 >::type >::type case6; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case6 , 0 >::type >::type >::type case_label6; typedef typename fusion::result_of::deref< typen
ame fusion::result_of::advance_c< flat_view_begin , 7 >::type >::type case7; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case7 , 0 >::type >::type >::type case_label7;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<6>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label7::value : eval( proto::child_c<1>( fusion::deref( fusio
n::advance_c<7>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 6
>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label7::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 7>(fusion::begin(flat_view)) ) ) , ctx ); break;
default:
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
fusion::deref(
fusion::advance_c<
@@ -542,9 +542,9 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 3 >::type >::type case3; typedef typename proto::detail::
uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case3 , 0 >::type >::type >::type case_label3; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 4 >::type >::type case4; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case4 , 0 >::type >::type >::type case_label4; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 5 >::type >::type case5; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case5 , 0 >::type >::type >::type case_label5; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 6 >::type >::type case6; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case6 , 0 >::type >::type >::type case_label6; typedef typename fusion::result_of::deref< typen
ame fusion::result_of::advance_c< flat_view_begin , 7 >::type >::type case7; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case7 , 0 >::type >::type >::type case_label7; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 8 >::type >::type case8; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case8 , 0 >::type >::type >::type case_label8; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 9 >::type >::type case9; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case9 , 0 >::type >::type >::type case_label9;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<6>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label7::value : eval( proto::child_c<1>( fusion::deref( fusio
n::advance_c<7>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label8::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<8>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label9::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<9>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 6
>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label7::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 7>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label8::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 8>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label9::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 9>(fusion::begin(flat_view)) ) ) , ctx ); break;
}
}
template <typename Context, typename Cond, typename Cases>
@@ -565,11 +565,11 @@
flat_view_begin;
flat_view_type flat_view(proto::flatten(cases));
typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 0 >::type >::type case0; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case0 , 0 >::type >::type >::type case_label0; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 1 >::type >::type case1; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case1 , 0 >::type >::type >::type case_label1; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 2 >::type >::type case2; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case2 , 0 >::type >::type >::type case_label2; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 3 >::type >::type case3; typedef typename proto::detail::
uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case3 , 0 >::type >::type >::type case_label3; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 4 >::type >::type case4; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case4 , 0 >::type >::type >::type case_label4; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 5 >::type >::type case5; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case5 , 0 >::type >::type >::type case_label5; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 6 >::type >::type case6; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case6 , 0 >::type >::type >::type case_label6; typedef typename fusion::result_of::deref< typen
ame fusion::result_of::advance_c< flat_view_begin , 7 >::type >::type case7; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case7 , 0 >::type >::type >::type case_label7; typedef typename fusion::result_of::deref< typename fusion::result_of::advance_c< flat_view_begin , 8 >::type >::type case8; typedef typename proto::detail::uncvref< typename proto::result_of::value< typename proto::result_of::child_c< case8 , 0 >::type >::type >::type case_label8;
- switch(eval(cond, ctx))
+ switch(boost::phoenix::eval(cond, ctx))
{
- case case_label0::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<6>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label7::value : eval( proto::child_c<1>( fusion::deref( fusio
n::advance_c<7>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label8::value : eval( proto::child_c<1>( fusion::deref( fusion::advance_c<8>(fusion::begin(flat_view)) ) ) , ctx ); break;
+ case case_label0::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 0>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label1::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 1>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label2::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 2>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label3::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 3>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label4::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 4>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label5::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 5>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label6::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 6
>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label7::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 7>(fusion::begin(flat_view)) ) ) , ctx ); break; case case_label8::value : boost::phoenix::eval( proto::child_c<1>( fusion::deref( fusion::advance_c< 8>(fusion::begin(flat_view)) ) ) , ctx ); break;
default:
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
fusion::deref(
fusion::advance_c<
Modified: trunk/boost/phoenix/statement/detail/preprocessed/try_catch_eval_10.hpp
==============================================================================
--- trunk/boost/phoenix/statement/detail/preprocessed/try_catch_eval_10.hpp (original)
+++ trunk/boost/phoenix/statement/detail/preprocessed/try_catch_eval_10.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -24,9 +24,9 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); }
}
template <typename Try, typename A0, typename Context>
typename boost::disable_if<
@@ -40,12 +40,12 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
catch(...)
{
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
a0
)
@@ -71,9 +71,9 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); }
}
template <typename Try, typename A0 , typename A1, typename Context>
typename boost::disable_if<
@@ -87,12 +87,12 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); }
catch(...)
{
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
a1
)
@@ -118,9 +118,9 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); }
}
template <typename Try, typename A0 , typename A1 , typename A2, typename Context>
typename boost::disable_if<
@@ -134,12 +134,12 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); }
catch(...)
{
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
a2
)
@@ -165,9 +165,9 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a3), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a3), ctx); }
}
template <typename Try, typename A0 , typename A1 , typename A2 , typename A3, typename Context>
typename boost::disable_if<
@@ -181,12 +181,12 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); }
catch(...)
{
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
a3
)
@@ -212,9 +212,9 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a4), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a4), ctx); }
}
template <typename Try, typename A0 , typename A1 , typename A2 , typename A3 , typename A4, typename Context>
typename boost::disable_if<
@@ -228,12 +228,12 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a3), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a3), ctx); }
catch(...)
{
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
a4
)
@@ -259,9 +259,9 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a5), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a5), ctx); }
}
template <typename Try, typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5, typename Context>
typename boost::disable_if<
@@ -275,12 +275,12 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a4), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a4), ctx); }
catch(...)
{
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
a5
)
@@ -306,9 +306,9 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a5), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { eval(proto
::child_c<1>(a6), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a5), ctx); } catch( typename proto::res
ult_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a6), ctx); }
}
template <typename Try, typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6, typename Context>
typename boost::disable_if<
@@ -322,12 +322,12 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a5), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a5), ctx); }
catch(...)
{
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
a6
)
@@ -353,9 +353,9 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a5), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { eval(proto
::child_c<1>(a6), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A7 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a7), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a5), ctx); } catch( typename proto::res
ult_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a6), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A7 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a7), ctx); }
}
template <typename Try, typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7, typename Context>
typename boost::disable_if<
@@ -369,12 +369,12 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a5), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { eval(proto
::child_c<1>(a6), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a5), ctx); } catch( typename proto::res
ult_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a6), ctx); }
catch(...)
{
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
a7
)
@@ -400,9 +400,9 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a5), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { eval(proto
::child_c<1>(a6), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A7 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a7), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A8 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a8), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a5), ctx); } catch( typename proto::res
ult_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a6), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A7 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a7), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A8 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a8), ctx); }
}
template <typename Try, typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8, typename Context>
typename boost::disable_if<
@@ -416,12 +416,12 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a5), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { eval(proto
::child_c<1>(a6), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A7 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a7), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a5), ctx); } catch( typename proto::res
ult_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a6), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A7 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a7), ctx); }
catch(...)
{
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
a8
)
@@ -447,9 +447,9 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a5), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { eval(proto
::child_c<1>(a6), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A7 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a7), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A8 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a8), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A9 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a9), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a5), ctx); } catch( typename proto::res
ult_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a6), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A7 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a7), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A8 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a8), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A9 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a9), ctx); }
}
template <typename Try, typename A0 , typename A1 , typename A2 , typename A3 , typename A4 , typename A5 , typename A6 , typename A7 , typename A8 , typename A9, typename Context>
typename boost::disable_if<
@@ -463,12 +463,12 @@
{
try
{
- eval(proto::child_c<0>(try_), ctx);
+ boost::phoenix::eval(proto::child_c<0>(try_), ctx);
}
- catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a5), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { eval(proto
::child_c<1>(a6), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A7 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a7), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A8 , 0 >::type >::type::type & ) { eval(proto::child_c<1>(a8), ctx); }
+ catch( typename proto::result_of::value< typename proto::result_of::child_c< A0 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a0), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A1 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a1), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A2 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a2), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A3 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a3), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A4 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a4), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A5 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a5), ctx); } catch( typename proto::res
ult_of::value< typename proto::result_of::child_c< A6 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a6), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A7 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a7), ctx); } catch( typename proto::result_of::value< typename proto::result_of::child_c< A8 , 0 >::type >::type::type & ) { boost::phoenix::eval(proto::child_c<1>(a8), ctx); }
catch(...)
{
- eval(
+ boost::phoenix::eval(
proto::child_c<0>(
a9
)
Modified: trunk/boost/phoenix/statement/detail/switch.hpp
==============================================================================
--- trunk/boost/phoenix/statement/detail/switch.hpp (original)
+++ trunk/boost/phoenix/statement/detail/switch.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -56,7 +56,7 @@
#define BOOST_PHOENIX_SWITCH_EVAL_R(Z, N, DATA) \
case BOOST_PP_CAT(case_label, N)::value : \
- boost::phoenix::eval( \
+ boost::phoenix::eval( \
proto::child_c<1>( \
fusion::deref( \
fusion::advance_c<N>(fusion::begin(flat_view)) \
Modified: trunk/boost/phoenix/statement/switch.hpp
==============================================================================
--- trunk/boost/phoenix/statement/switch.hpp (original)
+++ trunk/boost/phoenix/statement/switch.hpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -9,12 +9,14 @@
#define BOOST_PHOENIX_STATEMENT_SWITCH_HPP
#include <boost/phoenix/core/limits.hpp>
+#include <boost/fusion/iterator/advance.hpp>
#include <boost/phoenix/core/call.hpp>
#include <boost/phoenix/core/expression.hpp>
#include <boost/phoenix/core/meta_grammar.hpp>
#include <boost/phoenix/core/is_nullary.hpp>
#include <boost/phoenix/support/iterate.hpp>
#include <boost/proto/make_expr.hpp>
+#include <boost/proto/fusion.hpp>
BOOST_PHOENIX_DEFINE_EXPRESSION(
(boost)(phoenix)(switch_case)
Modified: trunk/libs/phoenix/example/parallel_for.cpp
==============================================================================
--- trunk/libs/phoenix/example/parallel_for.cpp (original)
+++ trunk/libs/phoenix/example/parallel_for.cpp 2011-05-08 10:58:22 EDT (Sun, 08 May 2011)
@@ -110,7 +110,6 @@
return boost::phoenix::eval(expr, boost::phoenix::context(env, parallel_actions()));
}
-
// changing evaluation mechanism on the fly
BOOST_PHOENIX_DEFINE_EXPRESSION(
(parallel)
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk