Update of /cvsroot/boost/boost/boost/xpressive/proto
In directory
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15985/boost/xpressive/proto
Modified Files:
fusion.hpp op_base.hpp
Log Message:
fix proto/fusion integration, add test for proto/fusion integration (marked
explicit), port all tests to Boost.UnitTest, fix dependency issue in
doc/Jamfile.v2
Index: fusion.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/fusion.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fusion.hpp 2 May 2006 02:03:34 -0000 1.3
+++ fusion.hpp 22 Oct 2006 03:28:00 -0000 1.4
@@ -14,7 +14,6 @@
#include <boost/type_traits/remove_reference.hpp>
#ifdef BOOST_PROTO_FUSION_V2
-# include <boost/fusion/support/tags.hpp>
# include <boost/fusion/support/is_view.hpp>
# include <boost/fusion/support/category_of.hpp>
# include <boost/fusion/sequence/container/list/cons.hpp>
@@ -55,7 +54,7 @@
: fusion::iterator_base<binary_tree_iterator<Cons> >
{
typedef binary_tree_iterator_tag tag; // for Fusion 1
- typedef binary_tree_iterator_tag ftag; // for Fusion 2
+ typedef binary_tree_iterator_tag fusion_tag; // for Fusion 2
#ifdef BOOST_PROTO_FUSION_V2
typedef fusion::forward_traversal_tag category;
#else
@@ -219,7 +218,7 @@
template<typename T>
struct apply
{
- typedef forward_sequence_tag type;
+ typedef forward_traversal_tag type;
};
};
Index: op_base.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/op_base.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- op_base.hpp 7 May 2006 16:33:58 -0000 1.13
+++ op_base.hpp 22 Oct 2006 03:28:00 -0000 1.14
@@ -166,7 +166,7 @@
{
typedef Arg arg_type;
typedef Tag tag_type;
- typedef tag<Tag> ftag; // for Fusion-2 compatibility
+ typedef tag<Tag> fusion_tag; // for Fusion-2 compatibility
typedef tag<Tag> tag; // for Fusion-1 compatibility
typedef fusion::single_view<arg_type> arg_view;
@@ -202,7 +202,7 @@
typedef Node node_type;
typedef typename remove_reference<Node>::type::children_type const
&children_type;
typedef binary_segmented_view_tag tag;
- typedef binary_segmented_view_tag ftag;
+ typedef binary_segmented_view_tag fusion_tag;
explicit binary_segmented_view(typename call_traits<Node>::param_type
node)
: val(node)
@@ -237,7 +237,7 @@
typedef typename tag_type<left_type>::type left_tag;
typedef typename tag_type<right_type>::type right_tag;
typedef Tag tag_type;
- typedef tag<Tag> ftag; // for Fusion-2 compatibility
+ typedef tag<Tag> fusion_tag; // for Fusion-2 compatibility
typedef tag<Tag> tag; // for Fusion-1 compatibility
typedef typename mpl::if_<
@@ -285,7 +285,7 @@
: op_base<nary_op<Fun, BOOST_PP_ENUM_PARAMS(BOOST_PROTO_MAX_ARITY, A)> >
{
typedef function_tag tag_type;
- typedef tag<function_tag> ftag; // for Fusion-2 compatibility
+ typedef tag<function_tag> fusion_tag; // for Fusion-2 compatibility
typedef tag<function_tag> tag; // for Fusion-1 compatibility
typedef Fun functor_type;
typedef fusion::tuple<
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
