Update of /cvsroot/boost/boost/boost/xpressive/proto
In directory
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11364/boost/xpressive/proto
Modified Files:
operators.hpp
Log Message:
minor clean-up
Index: operators.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/operators.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- operators.hpp 30 Dec 2006 21:48:20 -0000 1.19
+++ operators.hpp 31 Dec 2006 18:40:17 -0000 1.20
@@ -46,14 +46,14 @@
, expr<
Tag
, args2<
- ref<Left>
+ ref<typename Left::boost_proto_expr_type_>
, typename meta::generate<typename Left::domain,
expr<tag::terminal, args1<Right &> > >::type
>
>
>
{
typedef expr<tag::terminal, args1<Right &> > term_type;
- typedef expr<Tag, args2<ref<Left>, typename
meta::generate<typename Left::domain, term_type>::type> > expr_type;
+ typedef expr<Tag, args2<ref<typename
Left::boost_proto_expr_type_>, typename meta::generate<typename Left::domain,
term_type>::type> > expr_type;
template<typename Left2>
static typename meta::generate<typename Left2::domain,
expr_type>::type
@@ -73,13 +73,13 @@
Tag
, args2<
typename meta::generate<typename Right::domain,
expr<tag::terminal, args1<Left &> > >::type
- , ref<Right>
+ , ref<typename Right::boost_proto_expr_type_>
>
>
>
{
typedef expr<tag::terminal, args1<Left &> > term_type;
- typedef expr<Tag, args2<typename meta::generate<typename
Right::domain, term_type>::type, ref<Right> > > expr_type;
+ typedef expr<Tag, args2<typename meta::generate<typename
Right::domain, term_type>::type, ref<typename Right::boost_proto_expr_type_> >
> expr_type;
template<typename Right2>
static typename meta::generate<typename Right2::domain,
expr_type>::type
@@ -100,10 +100,10 @@
struct as_expr_if<Tag, Left, Right, typename
Left::is_boost_proto_expr_, typename Right::is_boost_proto_expr_>
: meta::generate<
typename Left::domain
- , expr<Tag, args2<ref<Left>, ref<Right> > >
+ , expr<Tag, args2<ref<typename Left::boost_proto_expr_type_>,
ref<typename Right::boost_proto_expr_type_> > >
>
{
- typedef expr<Tag, args2<ref<Left>, ref<Right> > > expr_type;
+ typedef expr<Tag, args2<ref<typename
Left::boost_proto_expr_type_>, ref<typename Right::boost_proto_expr_type_> > >
expr_type;
BOOST_MPL_ASSERT((is_same<typename Left::domain, typename
Right::domain>));
template<typename Left2>
@@ -114,7 +114,7 @@
return meta::generate<typename Left::domain,
expr_type>::make(that);
}
};
- }
+ } // detail
#define BOOST_PROTO_UNARY_OP(op, tag)\
template<typename Arg>\
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
