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

Subject: [Boost-commit] svn:boost r55052 - trunk/boost/spirit/home/qi/nonterminal
From: hartmut.kaiser_at_[hidden]
Date: 2009-07-20 22:29:28

Author: hkaiser
Date: 2009-07-20 22:29:28 EDT (Mon, 20 Jul 2009)
New Revision: 55052
URL: http://svn.boost.org/trac/boost/changeset/55052

Log:
Spirit: fixed bogus assertion.
Text files modified: 
   trunk/boost/spirit/home/qi/nonterminal/error_handler.hpp |     8 ++++----                                
   1 files changed, 4 insertions(+), 4 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	2009-07-20 22:29:28 EDT (Mon, 20 Jul 2009)
@@ -124,13 +124,13 @@
                     {
                         case fail: 
                             BOOST_ASSERT(
-                                traits::is_multi_pass<Iterator>::value &&
-                                action != retry && action != fail);
+                                !traits::is_multi_pass<Iterator>::value ||
+                                (action != retry && action != fail));
                             return false;
                         case retry: 
                             BOOST_ASSERT(
-                                traits::is_multi_pass<Iterator>::value &&
-                                action != retry && action != fail);
+                                !traits::is_multi_pass<Iterator>::value ||
+                                (action != retry && action != fail));
                             continue;
                         case accept: return true;
                         case rethrow: throw x;