[Boost-commit] svn:boost r72589 - in branches/release: . boost boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/karma/directive boost/spirit/home/karma/string

Subject: [Boost-commit] svn:boost r72589 - in branches/release: . boost boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/karma/directive boost/spirit/home/karma/string
From: hartmut.kaiser_at_[hidden]
Date: 2011-06-14 13:10:03

Author: hkaiser
Date: 2011-06-14 13:10:02 EDT (Tue, 14 Jun 2011)
New Revision: 72589
URL: http://svn.boost.org/trac/boost/changeset/72589

Log:
Merged revision(s) 72586, 72588 from trunk:
Spirit: fixing Karma compilation errors with gcc
........
Spirit: refinement of latest bug fix
........

authorized by rene
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/boost/spirit/   (props changed)
   branches/release/boost/spirit/home/   (props changed)
   branches/release/boost/spirit/home/karma/   (props changed)
Text files modified: 
   branches/release/boost/spirit/home/karma/directive/columns.hpp |     6 ++++++                                  
   branches/release/boost/spirit/home/karma/string/symbols.hpp    |     2 +-                                      
   2 files changed, 7 insertions(+), 1 deletions(-)

Modified: branches/release/boost/spirit/home/karma/directive/columns.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/directive/columns.hpp	(original)
+++ branches/release/boost/spirit/home/karma/directive/columns.hpp	2011-06-14 13:10:02 EDT (Tue, 14 Jun 2011)
@@ -186,6 +186,9 @@
         result_type operator()(unused_type, Subject const& subject
           , unused_type) const
         {
+#if defined(BOOST_SPIRIT_NO_PREDEFINED_TERMINALS)
+            eol_type const eol = eol_type();
+#endif
             return result_type(subject, detail::default_columns()
               , compile<karma::domain>(eol));
         }
@@ -209,6 +212,9 @@
         result_type operator()(Terminal const& term, Subject const& subject
           , unused_type) const
         {
+#if defined(BOOST_SPIRIT_NO_PREDEFINED_TERMINALS)
+            eol_type const eol = eol_type();
+#endif
             return result_type(subject, fusion::at_c<0>(term.args)
               , compile<karma::domain>(eol));
         }

Modified: branches/release/boost/spirit/home/karma/string/symbols.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/string/symbols.hpp	(original)
+++ branches/release/boost/spirit/home/karma/string/symbols.hpp	2011-06-14 13:10:02 EDT (Tue, 14 Jun 2011)
@@ -564,7 +564,7 @@
         // non-const version needed to suppress proto's -= kicking in
         template <typename Attr>
         friend remover const&
-        operator-= (symbols& sym, Attr& str)
+        operator-= (symbols& sym, Attr& attr)
         {
             return sym.remove(attr);
         }