Subject: [Boost-commit] svn:boost r57010 - in trunk/boost/spirit/home: karma/nonterminal qi/nonterminal
From: hartmut.kaiser_at_[hidden]
Date: 2009-10-20 08:16:06
Author: hkaiser
Date: 2009-10-20 08:16:06 EDT (Tue, 20 Oct 2009)
New Revision: 57010
URL: http://svn.boost.org/trac/boost/changeset/57010
Log:
Spirit: fixing compiler versioning problem
Text files modified:
trunk/boost/spirit/home/karma/nonterminal/grammar.hpp | 5 +++--
trunk/boost/spirit/home/qi/nonterminal/grammar.hpp | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
Modified: trunk/boost/spirit/home/karma/nonterminal/grammar.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/nonterminal/grammar.hpp (original)
+++ trunk/boost/spirit/home/karma/nonterminal/grammar.hpp 2009-10-20 08:16:06 EDT (Tue, 20 Oct 2009)
@@ -68,8 +68,9 @@
// If you see the assertion below failing then the start rule
// passed to the constructor of the grammar is not compatible with
// the grammar (i.e. it uses different template parameters).
- BOOST_SPIRIT_ASSERT_MSG(false, incompatible_start_rule,
- (rule<Iterator_, T1_, T2_, T3_>));
+ BOOST_SPIRIT_ASSERT_MSG(
+ (is_same<start_type, rule<Iterator_, T1_, T2_, T3_> >::value)
+ , incompatible_start_rule, (rule<Iterator_, T1_, T2_, T3_>));
}
std::string name() const
Modified: trunk/boost/spirit/home/qi/nonterminal/grammar.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/nonterminal/grammar.hpp (original)
+++ trunk/boost/spirit/home/qi/nonterminal/grammar.hpp 2009-10-20 08:16:06 EDT (Tue, 20 Oct 2009)
@@ -65,8 +65,9 @@
// If you see the assertion below failing then the start rule
// passed to the constructor of the grammar is not compatible with
// the grammar (i.e. it uses different template parameters).
- BOOST_SPIRIT_ASSERT_MSG(false, incompatible_start_rule,
- (rule<Iterator_, T1_, T2_, T3_>));
+ BOOST_SPIRIT_ASSERT_MSG(
+ (is_same<start_type, rule<Iterator_, T1_, T2_, T3_> >::value)
+ , incompatible_start_rule, (rule<Iterator_, T1_, T2_, T3_>));
}
std::string name() const