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

Subject: [Boost-commit] svn:boost r74291 - trunk/boost/spirit/home/support/algorithm
From: joel_at_[hidden]
Date: 2011-09-06 23:54:50

Author: djowel
Date: 2011-09-06 23:54:48 EDT (Tue, 06 Sep 2011)
New Revision: 74291
URL: http://svn.boost.org/trac/boost/changeset/74291

Log:
Fixed problem with handling BOOST_FUSION_ADAPT_ADT
Text files modified: 
   trunk/boost/spirit/home/support/algorithm/any_if.hpp |     7 +++++--                                 
   1 files changed, 5 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	2011-09-06 23:54:48 EDT (Tue, 06 Sep 2011)
@@ -42,7 +42,7 @@
     {
         ///////////////////////////////////////////////////////////////////////
         template <typename Iterator, typename Pred>
-        struct apply_predicate 
+        struct apply_predicate
           : mpl::apply1<Pred, typename fusion::result_of::value_of<Iterator>::type>
         {};
 
@@ -180,7 +180,10 @@
         any_if (First1 const& first1, First2 const& first2, Last1 const& last1
           , Last2 const& last2, F& f, mpl::false_)
         {
-            return f(*first1, attribute_value<Pred, First1, Last2>(first2)) ||
+            typename result_of::attribute_value<First1, First2, Last2, Pred>::type
+                attribute = attribute_value<Pred, First1, Last2>(first2);
+
+            return f(*first1, attribute) ||
                 detail::any_if<Pred>(
                     fusion::next(first1)
                   , attribute_next<Pred, First1, Last2>(first2)