Subject: [Boost-commit] svn:boost r68079 - in branches/release/boost/spirit/home: karma/detail qi support
From: hartmut.kaiser_at_[hidden]
Date: 2011-01-12 22:09:30
Author: hkaiser
Date: 2011-01-12 22:09:28 EST (Wed, 12 Jan 2011)
New Revision: 68079
URL: http://svn.boost.org/trac/boost/changeset/68079
Log:
Spirit: fixing merge problems
Text files modified:
branches/release/boost/spirit/home/karma/detail/pass_container.hpp | 15 ++-------------
branches/release/boost/spirit/home/qi/parse_attr.hpp | 1 -
branches/release/boost/spirit/home/support/adapt_adt_attributes.hpp | 3 +--
3 files changed, 3 insertions(+), 16 deletions(-)
Modified: branches/release/boost/spirit/home/karma/detail/pass_container.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/detail/pass_container.hpp (original)
+++ branches/release/boost/spirit/home/karma/detail/pass_container.hpp 2011-01-12 22:09:28 EST (Wed, 12 Jan 2011)
@@ -95,10 +95,7 @@
template <typename Component>
bool dispatch_attribute_element(Component const& component, mpl::true_) const
{
- bool result = f(component, make_iterator_range(iter, end));
- if (iter != end)
- ++iter;
- return result;
+ return f(component, make_iterator_range(iter, end));
}
// This handles the distinction between elements in a sequence expecting
@@ -151,18 +148,10 @@
// This handles the case where the attribute of the component is
// an STL container *and* its value_type is convertible to the
// target attribute's (Attr) value_type.
- //
- // For some attributes (like utree) we assume, that the generator ate
- // at least one element of the sequence. This isn't pretty, but
- // generators are either assumed to consume all remaining attributes or
- // to consume exactly one.
template <typename Component>
bool dispatch_main(Component const& component, mpl::true_) const
{
- bool result = f(component, make_iterator_range(iter, end));
- if (iter != end)
- ++iter;
- return result;
+ return f(component, make_iterator_range(iter, end));
}
// Dispatches to dispatch_main depending on the attribute type
Modified: branches/release/boost/spirit/home/qi/parse_attr.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/parse_attr.hpp (original)
+++ branches/release/boost/spirit/home/qi/parse_attr.hpp 2011-01-12 22:09:28 EST (Wed, 12 Jan 2011)
@@ -168,7 +168,6 @@
return qi::phrase_parse(first, last, expr, skipper, skip_flag::postskip
, BOOST_PP_ENUM_PARAMS(N, attr));
}
-
}}}
#undef BOOST_SPIRIT_QI_ATTRIBUTE_REFERENCE
Modified: branches/release/boost/spirit/home/support/adapt_adt_attributes.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/adapt_adt_attributes.hpp (original)
+++ branches/release/boost/spirit/home/support/adapt_adt_attributes.hpp 2011-01-12 22:09:28 EST (Wed, 12 Jan 2011)
@@ -83,8 +83,7 @@
{};
///////////////////////////////////////////////////////////////////////////
- template <
- typename T, int N, bool Const, typename Attribute, typename Domain>
+ template <typename T, int N, typename Attribute, typename Domain>
struct transform_attribute<
fusion::extension::adt_attribute_proxy<T, N, false>
, Attribute