Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r72586 - in trunk/boost/spirit/home/karma: directive string
From: hartmut.kaiser_at_[hidden]
Date: 2011-06-14 11:33:29


Author: hkaiser
Date: 2011-06-14 11:33:28 EDT (Tue, 14 Jun 2011)
New Revision: 72586
URL: http://svn.boost.org/trac/boost/changeset/72586

Log:
Spirit: fixing Karma compilation errors with gcc
Text files modified:
   trunk/boost/spirit/home/karma/directive/columns.hpp | 6 ++++++
   trunk/boost/spirit/home/karma/string/symbols.hpp | 2 +-
   2 files changed, 7 insertions(+), 1 deletions(-)

Modified: trunk/boost/spirit/home/karma/directive/columns.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/columns.hpp (original)
+++ trunk/boost/spirit/home/karma/directive/columns.hpp 2011-06-14 11:33:28 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;
+#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;
+#endif
             return result_type(subject, fusion::at_c<0>(term.args)
               , compile<karma::domain>(eol));
         }

Modified: trunk/boost/spirit/home/karma/string/symbols.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/string/symbols.hpp (original)
+++ trunk/boost/spirit/home/karma/string/symbols.hpp 2011-06-14 11:33:28 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);
         }


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk