[Boost-commit] svn:boost r71077 - trunk/boost/spirit/home/qi/nonterminal

Subject: [Boost-commit] svn:boost r71077 - trunk/boost/spirit/home/qi/nonterminal
From: hartmut.kaiser_at_[hidden]
Date: 2011-04-07 08:19:29

Author: hkaiser
Date: 2011-04-07 08:19:28 EDT (Thu, 07 Apr 2011)
New Revision: 71077
URL: http://svn.boost.org/trac/boost/changeset/71077

Log:
Spirit: fixing assertions in error_handler when used with multi_pass
Text files modified: 
   trunk/boost/spirit/home/qi/nonterminal/error_handler.hpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/boost/spirit/home/qi/nonterminal/error_handler.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/nonterminal/error_handler.hpp	(original)
+++ trunk/boost/spirit/home/qi/nonterminal/error_handler.hpp	2011-04-07 08:19:28 EDT (Thu, 07 Apr 2011)
@@ -125,12 +125,12 @@
                         case fail: 
                             BOOST_ASSERT(
                                 !traits::is_multi_pass<Iterator>::value ||
-                                (action != retry && action != fail));
+                                    action == retry || action == fail);
                             return false;
                         case retry: 
                             BOOST_ASSERT(
                                 !traits::is_multi_pass<Iterator>::value ||
-                                (action != retry && action != fail));
+                                    action == retry || action == fail);
                             continue;
                         case accept: return true;
                         case rethrow: boost::throw_exception(x);