[Boost-commit] svn:boost r84118 - trunk/boost/spirit/home/support/algorithm

Subject: [Boost-commit] svn:boost r84118 - trunk/boost/spirit/home/support/algorithm
From: hartmut.kaiser_at_[hidden]
Date: 2013-05-02 15:48:26

Author: hkaiser
Date: 2013-05-02 15:48:25 EDT (Thu, 02 May 2013)
New Revision: 84118
URL: http://svn.boost.org/trac/boost/changeset/84118

Log:
Fix #8066: Conflict with Boost.Log on GCC 4.4
Text files modified: 
   trunk/boost/spirit/home/support/algorithm/any_if.hpp    |     2 +-                                      
   trunk/boost/spirit/home/support/algorithm/any_if_ns.hpp |     2 +-                                      
   2 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/boost/spirit/home/support/algorithm/any_if.hpp
==============================================================================
--- trunk/boost/spirit/home/support/algorithm/any_if.hpp	(original)
+++ trunk/boost/spirit/home/support/algorithm/any_if.hpp	2013-05-02 15:48:25 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: trunk/boost/spirit/home/support/algorithm/any_if_ns.hpp
==============================================================================
--- trunk/boost/spirit/home/support/algorithm/any_if_ns.hpp	(original)
+++ trunk/boost/spirit/home/support/algorithm/any_if_ns.hpp	2013-05-02 15:48:25 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)