From: eric_at_[hidden]
Date: 2007-12-09 12:56:20
Author: eric_niebler
Date: 2007-12-09 12:56:20 EST (Sun, 09 Dec 2007)
New Revision: 41927
URL: http://svn.boost.org/trac/boost/changeset/41927
Log:
stoopid gcc name lookup spoils everything
Text files modified:
branches/proto/v3/boost/xpressive/detail/static/grammar.hpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
Modified: branches/proto/v3/boost/xpressive/detail/static/grammar.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/detail/static/grammar.hpp (original)
+++ branches/proto/v3/boost/xpressive/detail/static/grammar.hpp 2007-12-09 12:56:20 EST (Sun, 09 Dec 2007)
@@ -155,12 +155,12 @@
using namespace xpressive::detail;
struct MarkedSubExpr
- : assign<terminal<mark_placeholder>, _>
+ : proto::assign<terminal<mark_placeholder>, _>
{};
struct MarkedSubExprEx
: or_<
- assign<terminal<mark_placeholder>, _>
+ proto::assign<terminal<mark_placeholder>, _>
, shift_right<terminal<mark_begin_matcher>, _>
, shift_right<
terminal<repeat_begin_matcher>
@@ -362,7 +362,7 @@
, mpl::next<ListSet<Char>(_left)>()
>
, when<
- assign<terminal<set_initializer>, CharLiteral<Char> >
+ proto::assign<terminal<set_initializer>, CharLiteral<Char> >
, _one()
>
>
@@ -523,7 +523,7 @@
// Ignore nested actions, because attributes are scoped
when< subscript<_, _>, _state >
, when< terminal<_>, _state >
- , when< assign<terminal<attribute_placeholder<Nbr> >, _>, _arg(_right) >
+ , when< proto::assign<terminal<attribute_placeholder<Nbr> >, _>, _arg(_right) >
, otherwise< fold<_, _state, FindAttr<Nbr> > >
>
{};
@@ -862,7 +862,7 @@
struct case_<tag::assign, Dummy>
: or_<
// (s1= ...)
- when<assign<terminal<mark_placeholder>, Gram>, as_regex(as_marker)>
+ when<proto::assign<terminal<mark_placeholder>, Gram>, as_regex(as_marker)>
// (set= 'a')
, when<ListSet<Char>, as_matcher(_arg(_right), _visitor)>
>
@@ -959,7 +959,7 @@
, when<
or_<
complement<subscript<terminal<set_initializer>, terminal<_> > >
- , complement<assign<terminal<set_initializer>, terminal<_> > >
+ , complement<proto::assign<terminal<set_initializer>, terminal<_> > >
>
, as_regex(_make_complement(_right(_arg)))
>
@@ -1024,7 +1024,7 @@
: or_<
typename Cases<Char, Gram>::template case_<tag::assign>
, when<
- assign<terminal<attribute_placeholder<_> >, _>
+ proto::assign<terminal<attribute_placeholder<_> >, _>
, as_attr_matcher
>
>