Update of /cvsroot/boost/boost/boost/xpressive/proto
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27402/proto
Modified Files:
context.hpp expr.hpp extends.hpp fusion.hpp matches.hpp
operators.hpp proto_fwd.hpp proto_typeof.hpp ref.hpp
traits.hpp
Log Message:
rename proto::ref<> to proto::ref_<> to avoid gcc ADL weirdness with
boost::ref() and friends
Index: context.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/context.hpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- context.hpp 29 Apr 2007 03:38:49 -0000 1.26
+++ context.hpp 30 Apr 2007 23:07:18 -0000 1.27
@@ -141,9 +141,9 @@
};
#if BOOST_WORKAROUND(BOOST_MSVC, == 1400)
- template<typename T> T &ref_(T &t);
- template<typename T> T const &ref_(T const &t);
- #define BOOST_PROTO_REF(x) detail::ref_(x)
+ template<typename T> T &make_ref_(T &t);
+ template<typename T> T const &make_ref_(T const &t);
+ #define BOOST_PROTO_REF(x) detail::make_ref_(x)
#else
#define BOOST_PROTO_REF(x) x
#endif
Index: expr.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/expr.hpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- expr.hpp 5 Apr 2007 01:25:40 -0000 1.29
+++ expr.hpp 30 Apr 2007 23:07:18 -0000 1.30
@@ -63,7 +63,7 @@
};
template<typename Expr>
- struct address_of_hack<tag::address_of, ref<Expr> >
+ struct address_of_hack<tag::address_of, ref_<Expr> >
{
typedef Expr *type;
};
@@ -143,66 +143,66 @@
}
template<typename A>
- expr<tag::assign, args2<ref<expr>, typename
result_of::as_arg<A>::type> > const
+ expr<tag::assign, args2<ref_<expr>, typename
result_of::as_arg<A>::type> > const
operator =(A &a)
{
- expr<tag::assign, args2<ref<expr>, typename
result_of::as_arg<A>::type> > that = {{*this}, proto::as_arg(a)};
+ expr<tag::assign, args2<ref_<expr>, typename
result_of::as_arg<A>::type> > that = {{*this}, proto::as_arg(a)};
return that;
}
template<typename A>
- expr<tag::assign, args2<ref<expr>, typename result_of::as_arg<A
const>::type> > const
+ expr<tag::assign, args2<ref_<expr>, typename result_of::as_arg<A
const>::type> > const
operator =(A const &a)
{
- expr<tag::assign, args2<ref<expr>, typename
result_of::as_arg<A const>::type> > that = {{*this}, proto::as_arg(a)};
+ expr<tag::assign, args2<ref_<expr>, typename
result_of::as_arg<A const>::type> > that = {{*this}, proto::as_arg(a)};
return that;
}
template<typename A>
- expr<tag::assign, args2<ref<expr const>, typename
result_of::as_arg<A>::type> > const
+ expr<tag::assign, args2<ref_<expr const>, typename
result_of::as_arg<A>::type> > const
operator =(A &a) const
{
- expr<tag::assign, args2<ref<expr const>, typename
result_of::as_arg<A>::type> > that = {{*this}, proto::as_arg(a)};
+ expr<tag::assign, args2<ref_<expr const>, typename
result_of::as_arg<A>::type> > that = {{*this}, proto::as_arg(a)};
return that;
}
template<typename A>
- expr<tag::assign, args2<ref<expr const>, typename
result_of::as_arg<A const>::type> > const
+ expr<tag::assign, args2<ref_<expr const>, typename
result_of::as_arg<A const>::type> > const
operator =(A const &a) const
{
- expr<tag::assign, args2<ref<expr const>, typename
result_of::as_arg<A const>::type> > that = {{*this}, proto::as_arg(a)};
+ expr<tag::assign, args2<ref_<expr const>, typename
result_of::as_arg<A const>::type> > that = {{*this}, proto::as_arg(a)};
return that;
}
template<typename A>
- expr<tag::subscript, args2<ref<expr>, typename
result_of::as_arg<A>::type> > const
+ expr<tag::subscript, args2<ref_<expr>, typename
result_of::as_arg<A>::type> > const
operator [](A &a)
{
- expr<tag::subscript, args2<ref<expr>, typename
result_of::as_arg<A>::type> > that = {{*this}, proto::as_arg(a)};
+ expr<tag::subscript, args2<ref_<expr>, typename
result_of::as_arg<A>::type> > that = {{*this}, proto::as_arg(a)};
return that;
}
template<typename A>
- expr<tag::subscript, args2<ref<expr>, typename result_of::as_arg<A
const>::type> > const
+ expr<tag::subscript, args2<ref_<expr>, typename
result_of::as_arg<A const>::type> > const
operator [](A const &a)
{
- expr<tag::subscript, args2<ref<expr>, typename
result_of::as_arg<A const>::type> > that = {{*this}, proto::as_arg(a)};
+ expr<tag::subscript, args2<ref_<expr>, typename
result_of::as_arg<A const>::type> > that = {{*this}, proto::as_arg(a)};
return that;
}
template<typename A>
- expr<tag::subscript, args2<ref<expr const>, typename
result_of::as_arg<A>::type> > const
+ expr<tag::subscript, args2<ref_<expr const>, typename
result_of::as_arg<A>::type> > const
operator [](A &a) const
{
- expr<tag::subscript, args2<ref<expr const>, typename
result_of::as_arg<A>::type> > that = {{*this}, proto::as_arg(a)};
+ expr<tag::subscript, args2<ref_<expr const>, typename
result_of::as_arg<A>::type> > that = {{*this}, proto::as_arg(a)};
return that;
}
template<typename A>
- expr<tag::subscript, args2<ref<expr const>, typename
result_of::as_arg<A const>::type> > const
+ expr<tag::subscript, args2<ref_<expr const>, typename
result_of::as_arg<A const>::type> > const
operator [](A const &a) const
{
- expr<tag::subscript, args2<ref<expr const>, typename
result_of::as_arg<A const>::type> > that = {{*this}, proto::as_arg(a)};
+ expr<tag::subscript, args2<ref_<expr const>, typename
result_of::as_arg<A const>::type> > that = {{*this}, proto::as_arg(a)};
return that;
}
@@ -212,13 +212,13 @@
template<typename This>
struct result<This()>
{
- typedef expr<tag::function, args1<ref<expr const> > > type;
+ typedef expr<tag::function, args1<ref_<expr const> > > type;
};
- expr<tag::function, args1<ref<expr const> > > const
+ expr<tag::function, args1<ref_<expr const> > > const
operator ()() const
{
- expr<tag::function, args1<ref<expr const> > > that = {{*this}};
+ expr<tag::function, args1<ref_<expr const> > > that =
{{*this}};
return that;
}
Index: extends.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/extends.hpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- extends.hpp 5 Apr 2007 20:49:11 -0000 1.29
+++ extends.hpp 30 Apr 2007 23:07:18 -0000 1.30
@@ -109,37 +109,37 @@
#define BOOST_PROTO_EXTENDS_ASSIGN(Expr, Derived, Domain)\
template<typename A>\
- typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref<Derived >, typename
boost::proto::result_of::as_arg<A>::type> > >::type const\
+ typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref_<Derived >, typename
boost::proto::result_of::as_arg<A>::type> > >::type const\
operator =(A &a)\
{\
- typedef boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref<Derived >, typename
boost::proto::result_of::as_arg<A>::type> > that_type;\
+ typedef boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref_<Derived >, typename
boost::proto::result_of::as_arg<A>::type> > that_type;\
that_type that = {{*static_cast<Derived *>(this)},
boost::proto::as_arg(a)};\
return boost::proto::generate<Domain, that_type>::make(that);\
}\
\
template<typename A>\
- typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref<Derived >, typename
boost::proto::result_of::as_arg<A const>::type> > >::type const\
+ typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref_<Derived >, typename
boost::proto::result_of::as_arg<A const>::type> > >::type const\
operator =(A const &a)\
{\
- typedef boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref<Derived >, typename
boost::proto::result_of::as_arg<A const>::type> > that_type;\
+ typedef boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref_<Derived >, typename
boost::proto::result_of::as_arg<A const>::type> > that_type;\
that_type that = {{*static_cast<Derived *>(this)},
boost::proto::as_arg(a)};\
return boost::proto::generate<Domain, that_type>::make(that);\
}\
\
template<typename A>\
- typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref<Derived const>, typename
boost::proto::result_of::as_arg<A>::type> > >::type const\
+ typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref_<Derived const>, typename
boost::proto::result_of::as_arg<A>::type> > >::type const\
operator =(A &a) const\
{\
- typedef boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref<Derived const>, typename
boost::proto::result_of::as_arg<A>::type> > that_type;\
+ typedef boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref_<Derived const>, typename
boost::proto::result_of::as_arg<A>::type> > that_type;\
that_type that = {{*static_cast<Derived const *>(this)},
boost::proto::as_arg(a)};\
return boost::proto::generate<Domain, that_type>::make(that);\
}\
\
template<typename A>\
- typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref<Derived const>, typename
boost::proto::result_of::as_arg<A const>::type> > >::type const\
+ typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref_<Derived const>, typename
boost::proto::result_of::as_arg<A const>::type> > >::type const\
operator =(A const &a) const\
{\
- typedef boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref<Derived const>, typename
boost::proto::result_of::as_arg<A const>::type> > that_type;\
+ typedef boost::proto::expr<boost::proto::tag::assign,
boost::proto::args2<boost::proto::ref_<Derived const>, typename
boost::proto::result_of::as_arg<A const>::type> > that_type;\
that_type that = {{*static_cast<Derived const *>(this)},
boost::proto::as_arg(a)};\
return boost::proto::generate<Domain, that_type>::make(that);\
}\
@@ -147,37 +147,37 @@
#define BOOST_PROTO_EXTENDS_SUBSCRIPT(Expr, Derived, Domain)\
template<typename A>\
- typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref<Derived >, typename
boost::proto::result_of::as_arg<A>::type> > >::type const\
+ typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref_<Derived >, typename
boost::proto::result_of::as_arg<A>::type> > >::type const\
operator [](A &a)\
{\
- typedef boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref<Derived >, typename
boost::proto::result_of::as_arg<A>::type> > that_type;\
+ typedef boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref_<Derived >, typename
boost::proto::result_of::as_arg<A>::type> > that_type;\
that_type that = {{*static_cast<Derived *>(this)},
boost::proto::as_arg(a)};\
return boost::proto::generate<Domain, that_type>::make(that);\
}\
\
template<typename A>\
- typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref<Derived >, typename
boost::proto::result_of::as_arg<A const>::type> > >::type const\
+ typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref_<Derived >, typename
boost::proto::result_of::as_arg<A const>::type> > >::type const\
operator [](A const &a)\
{\
- typedef boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref<Derived >, typename
boost::proto::result_of::as_arg<A const>::type> > that_type;\
+ typedef boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref_<Derived >, typename
boost::proto::result_of::as_arg<A const>::type> > that_type;\
that_type that = {{*static_cast<Derived *>(this)},
boost::proto::as_arg(a)};\
return boost::proto::generate<Domain, that_type>::make(that);\
}\
\
template<typename A>\
- typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref<Derived const>, typename
boost::proto::result_of::as_arg<A>::type> > >::type const\
+ typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref_<Derived const>, typename
boost::proto::result_of::as_arg<A>::type> > >::type const\
operator [](A &a) const\
{\
- typedef boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref<Derived const>, typename
boost::proto::result_of::as_arg<A>::type> > that_type;\
+ typedef boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref_<Derived const>, typename
boost::proto::result_of::as_arg<A>::type> > that_type;\
that_type that = {{*static_cast<Derived const *>(this)},
boost::proto::as_arg(a)};\
return boost::proto::generate<Domain, that_type>::make(that);\
}\
\
template<typename A>\
- typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref<Derived const>, typename
boost::proto::result_of::as_arg<A const>::type> > >::type const\
+ typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref_<Derived const>, typename
boost::proto::result_of::as_arg<A const>::type> > >::type const\
operator [](A const &a) const\
{\
- typedef boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref<Derived const>, typename
boost::proto::result_of::as_arg<A const>::type> > that_type;\
+ typedef boost::proto::expr<boost::proto::tag::subscript,
boost::proto::args2<boost::proto::ref_<Derived const>, typename
boost::proto::result_of::as_arg<A const>::type> > that_type;\
that_type that = {{*static_cast<Derived const *>(this)},
boost::proto::as_arg(a)};\
return boost::proto::generate<Domain, that_type>::make(that);\
}\
@@ -192,13 +192,13 @@
template<typename This>\
struct result<This()>\
{\
- typedef typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::function,
boost::proto::args1<boost::proto::ref<Derived const> > > >::type type;\
+ typedef typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::function,
boost::proto::args1<boost::proto::ref_<Derived const> > > >::type type;\
};\
\
- typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::function,
boost::proto::args1<boost::proto::ref<Derived const> > > >::type const\
+ typename boost::proto::generate<Domain,
boost::proto::expr<boost::proto::tag::function,
boost::proto::args1<boost::proto::ref_<Derived const> > > >::type const\
operator ()() const\
{\
- typedef boost::proto::expr<boost::proto::tag::function,
boost::proto::args1<boost::proto::ref<Derived const> > > that_type;\
+ typedef boost::proto::expr<boost::proto::tag::function,
boost::proto::args1<boost::proto::ref_<Derived const> > > that_type;\
that_type that = {{*static_cast<Derived const *>(this)}};\
return boost::proto::generate<Domain, that_type>::make(that);\
}\
Index: fusion.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/fusion.hpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- fusion.hpp 5 Apr 2007 20:49:11 -0000 1.27
+++ fusion.hpp 30 Apr 2007 23:07:18 -0000 1.28
@@ -56,10 +56,10 @@
template<typename Expr>
struct children
- : proto::ref<Expr>
+ : proto::ref_<Expr>
{
children(Expr &expr)
- : proto::ref<Expr>(proto::ref<Expr>::make(expr))
+ : proto::ref_<Expr>(proto::ref_<Expr>::make(expr))
{}
};
@@ -350,13 +350,13 @@
typedef typename Sequence::tag_type tag_type;
typedef fusion::transform_view<
- proto::ref<Sequence>
+ proto::ref_<Sequence>
, as_element<tag_type>
> type;
static type call(Sequence &sequence)
{
- proto::ref<Sequence> r = {sequence};
+ proto::ref_<Sequence> r = {sequence};
return type(r, as_element<tag_type>());
}
};
@@ -496,7 +496,7 @@
// };
//
// template<typename Expr>
-// struct sequence_tag<proto::ref<Expr> >
+// struct sequence_tag<proto::ref_<Expr> >
// {
// typedef proto::proto_expr_tag type;
// };
Index: matches.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/matches.hpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- matches.hpp 17 Apr 2007 16:32:33 -0000 1.42
+++ matches.hpp 30 Apr 2007 23:07:18 -0000 1.43
@@ -112,7 +112,7 @@
{};
// How terminal_matches<> handles references and cv-qualifiers.
- // The cv and ref matter *only* if the grammar has a top-level ref.
+ // The cv and ref_ matter *only* if the grammar has a top-level
ref_.
//
// Expr | Grammar | Match
// ------------------------------
Index: operators.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/operators.hpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- operators.hpp 29 Apr 2007 03:38:49 -0000 1.27
+++ operators.hpp 30 Apr 2007 23:07:18 -0000 1.28
@@ -36,14 +36,14 @@
, expr<
Tag
, args2<
- ref<Left>
+ ref_<Left>
, typename 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 generate<typename
Left::domain, term_type>::type> > expr_type;
+ typedef expr<Tag, args2<ref_<Left>, typename generate<typename
Left::domain, term_type>::type> > expr_type;
static typename generate<typename Left::domain, expr_type>::type
make(Left &left, Right &right)
@@ -62,13 +62,13 @@
Tag
, args2<
typename generate<typename Right::domain,
expr<tag::terminal, args1<Left &> > >::type
- , ref<Right>
+ , ref_<Right>
>
>
>
{
typedef expr<tag::terminal, args1<Left &> > term_type;
- typedef expr<Tag, args2<typename generate<typename Right::domain,
term_type>::type, ref<Right> > > expr_type;
+ typedef expr<Tag, args2<typename generate<typename Right::domain,
term_type>::type, ref_<Right> > > expr_type;
static typename generate<typename Right::domain, expr_type>::type
make(Left &left, Right &right)
@@ -88,10 +88,10 @@
struct as_expr_if<Tag, Left, Right, typename
Left::is_boost_proto_expr_, typename Right::is_boost_proto_expr_>
: generate_if<
typename Left::domain
- , expr<Tag, args2<ref<Left>, ref<Right> > >
+ , expr<Tag, args2<ref_<Left>, ref_<Right> > >
>
{
- typedef expr<Tag, args2<ref<Left>, ref<Right> > > expr_type;
+ typedef expr<Tag, args2<ref_<Left>, ref_<Right> > > expr_type;
BOOST_MPL_ASSERT((is_same<typename Left::domain, typename
Right::domain>));
static typename generate<typename Left::domain, expr_type>::type
@@ -105,18 +105,18 @@
#define BOOST_PROTO_UNARY_OP(op, tag)\
template<typename Arg>\
- inline typename detail::generate_if<typename Arg::domain, expr<tag,
args1<ref<typename Arg::boost_proto_expr_type_> > > >::type const\
+ inline typename detail::generate_if<typename Arg::domain, expr<tag,
args1<ref_<typename Arg::boost_proto_expr_type_> > > >::type const\
operator op(Arg &arg)\
{\
- typedef expr<tag, args1<ref<typename Arg::boost_proto_expr_type_> > >
that_type;\
+ typedef expr<tag, args1<ref_<typename Arg::boost_proto_expr_type_> > >
that_type;\
that_type that = {{arg}};\
return generate<typename Arg::domain, that_type>::make(that);\
}\
template<typename Arg>\
- inline typename detail::generate_if<typename Arg::domain, expr<tag,
args1<ref<typename Arg::boost_proto_expr_type_ const> > > >::type const\
+ inline typename detail::generate_if<typename Arg::domain, expr<tag,
args1<ref_<typename Arg::boost_proto_expr_type_ const> > > >::type const\
operator op(Arg const &arg)\
{\
- typedef expr<tag, args1<ref<typename Arg::boost_proto_expr_type_
const> > > that_type;\
+ typedef expr<tag, args1<ref_<typename Arg::boost_proto_expr_type_
const> > > that_type;\
that_type that = {{arg}};\
return generate<typename Arg::domain, that_type>::make(that);\
}\
@@ -194,37 +194,37 @@
#undef BOOST_PROTO_BINARY_OP
template<typename Arg>
- inline typename detail::generate_if<typename Arg::domain,
expr<tag::post_inc, args1<ref<typename Arg::boost_proto_expr_type_> > > >::type
const
+ inline typename detail::generate_if<typename Arg::domain,
expr<tag::post_inc, args1<ref_<typename Arg::boost_proto_expr_type_> > >
>::type const
operator ++(Arg &arg, int)
{
- typedef expr<tag::post_inc, args1<ref<typename
Arg::boost_proto_expr_type_> > > that_type;
+ typedef expr<tag::post_inc, args1<ref_<typename
Arg::boost_proto_expr_type_> > > that_type;
that_type that = {{arg}};
return generate<typename Arg::domain, that_type>::make(that);
}
template<typename Arg>
- inline typename detail::generate_if<typename Arg::domain,
expr<tag::post_inc, args1<ref<typename Arg::boost_proto_expr_type_ const> > >
>::type const
+ inline typename detail::generate_if<typename Arg::domain,
expr<tag::post_inc, args1<ref_<typename Arg::boost_proto_expr_type_ const> > >
>::type const
operator ++(Arg const &arg, int)
{
- typedef expr<tag::post_inc, args1<ref<typename
Arg::boost_proto_expr_type_ const> > > that_type;
+ typedef expr<tag::post_inc, args1<ref_<typename
Arg::boost_proto_expr_type_ const> > > that_type;
that_type that = {{arg}};
return generate<typename Arg::domain, that_type>::make(that);
}
template<typename Arg>
- inline typename detail::generate_if<typename Arg::domain,
expr<tag::post_dec, args1<ref<typename Arg::boost_proto_expr_type_> > > >::type
const
+ inline typename detail::generate_if<typename Arg::domain,
expr<tag::post_dec, args1<ref_<typename Arg::boost_proto_expr_type_> > >
>::type const
operator --(Arg &arg, int)
{
- typedef expr<tag::post_dec, args1<ref<typename
Arg::boost_proto_expr_type_> > > that_type;
+ typedef expr<tag::post_dec, args1<ref_<typename
Arg::boost_proto_expr_type_> > > that_type;
that_type that = {{arg}};
return generate<typename Arg::domain, that_type>::make(that);
}
template<typename Arg>
- inline typename detail::generate_if<typename Arg::domain,
expr<tag::post_dec, args1<ref<typename Arg::boost_proto_expr_type_ const> > >
>::type const
+ inline typename detail::generate_if<typename Arg::domain,
expr<tag::post_dec, args1<ref_<typename Arg::boost_proto_expr_type_ const> > >
>::type const
operator --(Arg const &arg, int)
{
- typedef expr<tag::post_dec, args1<ref<typename
Arg::boost_proto_expr_type_ const> > > that_type;
+ typedef expr<tag::post_dec, args1<ref_<typename
Arg::boost_proto_expr_type_ const> > > that_type;
that_type that = {{arg}};
return generate<typename Arg::domain, that_type>::make(that);
}
Index: proto_fwd.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/proto_fwd.hpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- proto_fwd.hpp 29 Apr 2007 03:38:49 -0000 1.60
+++ proto_fwd.hpp 30 Apr 2007 23:07:18 -0000 1.61
@@ -103,7 +103,7 @@
struct expr;
template<typename Expr>
- struct ref;
+ struct ref_;
template<typename OpTag, typename DomainTag, typename EnableIf = void>
struct compiler;
Index: proto_typeof.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/proto_typeof.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- proto_typeof.hpp 29 Apr 2007 03:38:49 -0000 1.12
+++ proto_typeof.hpp 30 Apr 2007 23:07:18 -0000 1.13
@@ -63,7 +63,7 @@
BOOST_TYPEOF_REGISTER_TYPE(boost::proto::tag::subscript)
BOOST_TYPEOF_REGISTER_TYPE(boost::proto::tag::function)
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::proto::ref, (typename))
+BOOST_TYPEOF_REGISTER_TEMPLATE(boost::proto::ref_, (typename))
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::proto::expr, (typename)(typename)(long))
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::proto::literal, (typename)(typename))
Index: ref.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/ref.hpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ref.hpp 5 Apr 2007 01:25:40 -0000 1.26
+++ ref.hpp 30 Apr 2007 23:07:18 -0000 1.27
@@ -27,7 +27,7 @@
/**/
template<typename Expr>
- struct ref
+ struct ref_
{
typedef typename Expr::type type;
typedef typename Expr::tag_type tag_type;
@@ -47,18 +47,18 @@
return this->expr.cast();
}
- static ref<Expr> make(Expr &expr)
+ static ref_<Expr> make(Expr &expr)
{
- ref<Expr> that = {expr};
+ ref_<Expr> that = {expr};
return that;
}
Expr &expr;
};
- // ref-to-ref is not allowed. this will cause a compile error.
+ // ref_-to-ref_ is not allowed. this will cause a compile error.
template<typename Expr>
- struct ref<ref<Expr> >
+ struct ref_<ref_<Expr> >
{};
#undef BOOST_PROTO_ARG
@@ -74,7 +74,7 @@
};
template<typename T>
- struct unref<ref<T> >
+ struct unref<ref_<T> >
{
typedef typename T::boost_proto_expr_type_ type;
typedef T &reference;
@@ -139,13 +139,13 @@
}
template<typename T>
- T &operator()(ref<T> &t) const
+ T &operator()(ref_<T> &t) const
{
return t.expr;
}
template<typename T>
- T &operator()(ref<T> const &t) const
+ T &operator()(ref_<T> const &t) const
{
return t.expr;
}
Index: traits.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/traits.hpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- traits.hpp 29 Apr 2007 03:38:49 -0000 1.49
+++ traits.hpp 30 Apr 2007 23:07:18 -0000 1.50
@@ -135,7 +135,7 @@
template<typename T>
struct as_arg<T, typename T::is_boost_proto_expr_>
{
- typedef ref<T> type;
+ typedef ref_<T> type;
};
template<typename Expr, typename N>
@@ -146,7 +146,7 @@
// left
// BUGBUG this forces the instantiation of Expr. Couldn't we
// partially specialize left<> on expr< T, A > and
- // ref< expr< T, A > > and return A::arg0 ?
+ // ref_< expr< T, A > > and return A::arg0 ?
template<typename Expr>
struct left
: unref<typename Expr::arg0_type>
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
