[Boost-commit] svn:boost r57011 - in branches/release/boost/spirit: . home home/karma home/karma/nonterminal home/qi/nonterminal home/qi/numeric/detail home/support repository/home/qi/nonterminal

Subject: [Boost-commit] svn:boost r57011 - in branches/release/boost/spirit: . home home/karma home/karma/nonterminal home/qi/nonterminal home/qi/numeric/detail home/support repository/home/qi/nonterminal
From: hartmut.kaiser_at_[hidden]
Date: 2009-10-20 08:18:07

Author: hkaiser
Date: 2009-10-20 08:18:06 EDT (Tue, 20 Oct 2009)
New Revision: 57011
URL: http://svn.boost.org/trac/boost/changeset/57011

Log:
Spirit: fixing compiler versioning problem (merging from trunk)
Properties modified: 
   branches/release/boost/spirit/   (props changed)
   branches/release/boost/spirit/home/   (props changed)
   branches/release/boost/spirit/home/karma/   (props changed)
   branches/release/boost/spirit/home/qi/nonterminal/rule.hpp   (props changed)
   branches/release/boost/spirit/home/qi/numeric/detail/numeric_utils.hpp   (props changed)
   branches/release/boost/spirit/home/support/attributes.hpp   (props changed)
   branches/release/boost/spirit/repository/home/qi/nonterminal/subrule.hpp   (props changed)
Text files modified: 
   branches/release/boost/spirit/home/karma/nonterminal/grammar.hpp |     5 +++--                                   
   branches/release/boost/spirit/home/qi/nonterminal/grammar.hpp    |     5 +++--                                   
   2 files changed, 6 insertions(+), 4 deletions(-)

Modified: branches/release/boost/spirit/home/karma/nonterminal/grammar.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/nonterminal/grammar.hpp	(original)
+++ branches/release/boost/spirit/home/karma/nonterminal/grammar.hpp	2009-10-20 08:18: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: branches/release/boost/spirit/home/qi/nonterminal/grammar.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/nonterminal/grammar.hpp	(original)
+++ branches/release/boost/spirit/home/qi/nonterminal/grammar.hpp	2009-10-20 08:18: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