[Boost-commit] svn:boost r71099 - trunk/boost/spirit/home/qi/detail

Subject: [Boost-commit] svn:boost r71099 - trunk/boost/spirit/home/qi/detail
From: joel_at_[hidden]
Date: 2011-04-07 20:21:12

Author: djowel
Date: 2011-04-07 20:21:12 EDT (Thu, 07 Apr 2011)
New Revision: 71099
URL: http://svn.boost.org/trac/boost/changeset/71099

Log:
Fixes http://boost.2283326.n4.nabble.com/Grammar-stopped-compiling-on-more-recent-spirit-version-td3432652.html
Text files modified: 
   trunk/boost/spirit/home/qi/detail/alternative_function.hpp |    10 +++++++++-                              
   1 files changed, 9 insertions(+), 1 deletions(-)

Modified: trunk/boost/spirit/home/qi/detail/alternative_function.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/detail/alternative_function.hpp	(original)
+++ trunk/boost/spirit/home/qi/detail/alternative_function.hpp	2011-04-07 20:21:12 EDT (Thu, 07 Apr 2011)
@@ -31,7 +31,15 @@
         typedef typename mpl::end<types>::type end;
 
         typedef typename
-            mpl::find_if<types, traits::is_substitute<mpl::_1, Expected> >::type
+            mpl::find_if<types, is_same<mpl::_1, Expected> >::type
+        iter_1;
+
+        typedef typename
+            mpl::eval_if<
+                is_same<iter_1, end>,
+                mpl::find_if<types, traits::is_substitute<mpl::_1, Expected> >,
+                mpl::identity<iter_1>
+            >::type
         iter;
 
         typedef typename