Subject: [Boost-commit] svn:boost r61315 - trunk/boost/spirit/home/karma/detail
From: hartmut.kaiser_at_[hidden]
Date: 2010-04-16 08:05:21
Author: hkaiser
Date: 2010-04-16 08:05:20 EDT (Fri, 16 Apr 2010)
New Revision: 61315
URL: http://svn.boost.org/trac/boost/changeset/61315
Log:
Spirit: fixing two problems in Karma's attribute handling
Text files modified:
trunk/boost/spirit/home/karma/detail/pass_container.hpp | 2 +-
trunk/boost/spirit/home/karma/detail/string_generate.hpp | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
Modified: trunk/boost/spirit/home/karma/detail/pass_container.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/detail/pass_container.hpp (original)
+++ trunk/boost/spirit/home/karma/detail/pass_container.hpp 2010-04-16 08:05:20 EDT (Fri, 16 Apr 2010)
@@ -36,7 +36,7 @@
template <typename RHS, typename LHSAttribute>
struct has_same_elements<RHS, LHSAttribute, true>
: mpl::or_<
- is_convertible<typename LHSAttribute::value_type, RHS>
+ is_convertible<RHS, typename LHSAttribute::value_type>
, is_same<typename LHSAttribute::value_type, hold_any>
> {};
Modified: trunk/boost/spirit/home/karma/detail/string_generate.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/detail/string_generate.hpp (original)
+++ trunk/boost/spirit/home/karma/detail/string_generate.hpp 2010-04-16 08:05:20 EDT (Fri, 16 Apr 2010)
@@ -56,7 +56,9 @@
inline bool string_generate(OutputIterator& sink
, Container const& c, Filter filter)
{
- typedef typename traits::container_iterator<Container>::type iterator;
+ typedef typename traits::container_iterator<Container const>::type
+ iterator;
+
iterator end = boost::end(c);
for (iterator it = boost::begin(c); it != end; ++it)
{