Subject: [Boost-commit] svn:boost r84119 - in branches/release: . boost boost/spirit boost/spirit/home boost/spirit/home/support/algorithm
From: hartmut.kaiser_at_[hidden]
Date: 2013-05-02 15:51:15
Author: hkaiser
Date: 2013-05-02 15:51:13 EDT (Thu, 02 May 2013)
New Revision: 84119
URL: http://svn.boost.org/trac/boost/changeset/84119
Log:
Spirit: merging from trunk
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/boost/spirit/ (props changed)
branches/release/boost/spirit/home/ (props changed)
Text files modified:
branches/release/boost/spirit/home/support/algorithm/any_if.hpp | 2 +-
branches/release/boost/spirit/home/support/algorithm/any_if_ns.hpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Modified: branches/release/boost/spirit/home/support/algorithm/any_if.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/algorithm/any_if.hpp (original)
+++ branches/release/boost/spirit/home/support/algorithm/any_if.hpp 2013-05-02 15:51:13 EDT (Thu, 02 May 2013)
@@ -181,7 +181,7 @@
, Last2 const& last2, F& f, mpl::false_)
{
typename result_of::attribute_value<First1, First2, Last2, Pred>::type
- attribute = attribute_value<Pred, First1, Last2>(first2);
+ attribute = spirit::detail::attribute_value<Pred, First1, Last2>(first2);
return f(*first1, attribute) ||
detail::any_if<Pred>(
Modified: branches/release/boost/spirit/home/support/algorithm/any_if_ns.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/algorithm/any_if_ns.hpp (original)
+++ branches/release/boost/spirit/home/support/algorithm/any_if_ns.hpp 2013-05-02 15:51:13 EDT (Thu, 02 May 2013)
@@ -48,7 +48,7 @@
any_if_ns(First1 const& first1, First2 const& first2
, Last1 const& last1, Last2 const& last2, F& f, mpl::false_)
{
- return (0 != (f(*first1, attribute_value<Pred, First1, Last2>(first2)) |
+ return (0 != (f(*first1, spirit::detail::attribute_value<Pred, First1, Last2>(first2)) |
detail::any_if_ns<Pred>(
fusion::next(first1)
, attribute_next<Pred, First1, Last2>(first2)