Subject: [Boost-commit] svn:boost r55501 - in trunk/boost/spirit/home: karma/action karma/directive karma/stream support
From: hartmut.kaiser_at_[hidden]
Date: 2009-08-10 08:15:13
Author: hkaiser
Date: 2009-08-10 08:15:11 EDT (Mon, 10 Aug 2009)
New Revision: 55501
URL: http://svn.boost.org/trac/boost/changeset/55501
Log:
Spirit: pending changes...
Text files modified:
trunk/boost/spirit/home/karma/action/action.hpp | 4 ++--
trunk/boost/spirit/home/karma/directive/center_alignment.hpp | 9 +++------
trunk/boost/spirit/home/karma/directive/delimit.hpp | 9 +++------
trunk/boost/spirit/home/karma/directive/left_alignment.hpp | 9 +++------
trunk/boost/spirit/home/karma/directive/right_alignment.hpp | 9 +++------
trunk/boost/spirit/home/karma/stream/stream.hpp | 2 +-
trunk/boost/spirit/home/support/attributes.hpp | 1 +
7 files changed, 16 insertions(+), 27 deletions(-)
Modified: trunk/boost/spirit/home/karma/action/action.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/action/action.hpp (original)
+++ trunk/boost/spirit/home/karma/action/action.hpp 2009-08-10 08:15:11 EDT (Mon, 10 Aug 2009)
@@ -36,9 +36,9 @@
typedef Subject subject_type;
typedef typename subject_type::properties properties;
- template <typename Context, typename Unused>
+ template <typename Context, typename Iterator>
struct attribute
- : traits::attribute_of<Subject, Context>
+ : traits::attribute_of<Subject, Context, Iterator>
{};
action(Subject const& subject, Action f)
Modified: trunk/boost/spirit/home/karma/directive/center_alignment.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/center_alignment.hpp (original)
+++ trunk/boost/spirit/home/karma/directive/center_alignment.hpp 2009-08-10 08:15:11 EDT (Mon, 10 Aug 2009)
@@ -180,13 +180,10 @@
subject_type::properties::value | padding_type::properties::value
> properties;
- template <typename Context, typename Unused>
+ template <typename Context, typename Iterator>
struct attribute
- {
- typedef typename
- traits::attribute_of<Subject, Context>::type
- type;
- };
+ : traits::attribute_of<Subject, Context, Iterator>::type
+ {};
padding_center_alignment(Subject const& subject, Padding const& padding
, Width width = Width())
Modified: trunk/boost/spirit/home/karma/directive/delimit.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/delimit.hpp (original)
+++ trunk/boost/spirit/home/karma/directive/delimit.hpp 2009-08-10 08:15:11 EDT (Mon, 10 Aug 2009)
@@ -103,13 +103,10 @@
typedef typename subject_type::properties properties;
- template <typename Context, typename Unused>
+ template <typename Context, typename Iterator>
struct attribute
- {
- typedef typename
- traits::attribute_of<Subject, Context>::type
- type;
- };
+ : traits::attribute_of<subject_type, Context, Iterator>
+ {};
delimit_generator(Subject const& subject, Delimiter const& delimiter)
: subject(subject), delimiter(delimiter) {}
Modified: trunk/boost/spirit/home/karma/directive/left_alignment.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/left_alignment.hpp (original)
+++ trunk/boost/spirit/home/karma/directive/left_alignment.hpp 2009-08-10 08:15:11 EDT (Mon, 10 Aug 2009)
@@ -163,13 +163,10 @@
subject_type::properties::value | padding_type::properties::value
> properties;
- template <typename Context, typename Unused>
+ template <typename Context, typename Iterator>
struct attribute
- {
- typedef typename
- traits::attribute_of<Subject, Context>::type
- type;
- };
+ : traits::attribute_of<subject_type, Context, Iterator>
+ {};
padding_left_alignment(Subject const& subject, Padding const& padding
, Width width = Width())
Modified: trunk/boost/spirit/home/karma/directive/right_alignment.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/right_alignment.hpp (original)
+++ trunk/boost/spirit/home/karma/directive/right_alignment.hpp 2009-08-10 08:15:11 EDT (Mon, 10 Aug 2009)
@@ -173,13 +173,10 @@
subject_type::properties::value | padding_type::properties::value
> properties;
- template <typename Context, typename Unused>
+ template <typename Context, typename Iterator>
struct attribute
- {
- typedef typename
- traits::attribute_of<Subject, Context>::type
- type;
- };
+ : traits::attribute_of<subject_type, Context, Iterator>
+ {};
padding_right_alignment(Subject const& subject, Padding const& padding
, Width width = Width())
Modified: trunk/boost/spirit/home/karma/stream/stream.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/stream/stream.hpp (original)
+++ trunk/boost/spirit/home/karma/stream/stream.hpp 2009-08-10 08:15:11 EDT (Mon, 10 Aug 2009)
@@ -143,7 +143,7 @@
static bool
generate(OutputIterator&, Context&, Delimiter const&, unused_type)
{
- BOOST_SPIRIT_ASSERT_MSG(false, stream__not_usable_without_attribute,
+ BOOST_SPIRIT_ASSERT_MSG(false, stream_not_usable_without_attribute,
(OutputIterator, Delimiter));
return false;
}
Modified: trunk/boost/spirit/home/support/attributes.hpp
==============================================================================
--- trunk/boost/spirit/home/support/attributes.hpp (original)
+++ trunk/boost/spirit/home/support/attributes.hpp 2009-08-10 08:15:11 EDT (Mon, 10 Aug 2009)
@@ -360,6 +360,7 @@
struct make_attribute<unused_type, ActualAttribute>
{
typedef unused_type type;
+ typedef unused_type value_type;
static unused_type call(unused_type)
{
return unused;