comparison DEPENDENCIES/generic/include/boost/spirit/home/support/make_component.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

         struct impl : proto::transform_impl<Expr, State, Data>
         {
             typedef typename
                 proto::reverse_fold_tree<
                     proto::_
-                  , proto::make<fusion::nil>
+                  , proto::make<fusion::nil_>
                   , make_binary_helper<Grammar>
                 >::template impl<Expr, State, Data>
             reverse_fold_tree;
 
             typedef typename reverse_fold_tree::result_type elements;

                   , State
                   , Data
                 )>::type
             lhs_component;
 
-#ifndef BOOST_SPIRIT_USE_PHOENIX_V3
-            typedef typename
-                proto::result_of::value<
-                    typename proto::result_of::child_c<Expr, 1>::type
-                >::type
-            rhs_component;
-#else
             typedef
                 typename mpl::eval_if_c<
                     phoenix::is_actor<
                         typename proto::result_of::child_c<Expr, 1>::type
                     >::type::value

                   , proto::result_of::value<
                         typename proto::result_of::child_c<Expr, 1>::type
                     >
                 >::type
                 rhs_component;
-#endif
 
             typedef typename
                 result_of::make_cons<
                     lhs_component
                   , typename result_of::make_cons<rhs_component>::type

             typedef typename
                 make_component_::template
                     result<make_component_(elements_type, Data)>::type
             result_type;
 
-#ifndef BOOST_SPIRIT_USE_PHOENIX_V3
-            result_type operator()(
-                typename impl::expr_param expr
-              , typename impl::state_param state
-              , typename impl::data_param data
-            ) const
-            {
-                elements_type elements =
-                    detail::make_cons(
-                        Grammar()(
-                            proto::child_c<0>(expr), state, data)   // LHS
-                      , detail::make_cons(
-                            proto::value(proto::child_c<1>(expr)))  // RHS
-                    );
-
-                return make_component_()(elements, data);
-            }
-#else
             result_type operator()(
                 typename impl::expr_param expr
               , typename impl::state_param state
               , typename impl::data_param data
             ) const

                             proto::child_c<1>(expr))               // RHS
                     );
 
                 return make_component_()(elements, data);
             }
+        };
+    };
+}}}
+
 #endif
-        };
-    };
-}}}
-
-#endif