Subject: [Boost-commit] svn:boost r55261 - in trunk/boost/spirit/home/qi: directive operator
From: hartmut.kaiser_at_[hidden]
Date: 2009-07-30 14:44:43
Author: hkaiser
Date: 2009-07-29 09:50:08 EDT (Wed, 29 Jul 2009)
New Revision: 55261
URL: http://svn.boost.org/trac/boost/changeset/55261
Log:
Spirit: simplified recent changes
Text files modified:
trunk/boost/spirit/home/qi/directive/repeat.hpp | 5 +++--
trunk/boost/spirit/home/qi/operator/kleene.hpp | 5 +++--
trunk/boost/spirit/home/qi/operator/list.hpp | 5 +++--
trunk/boost/spirit/home/qi/operator/plus.hpp | 5 +++--
4 files changed, 12 insertions(+), 8 deletions(-)
Modified: trunk/boost/spirit/home/qi/directive/repeat.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/directive/repeat.hpp (original)
+++ trunk/boost/spirit/home/qi/directive/repeat.hpp 2009-07-29 09:50:08 EDT (Wed, 29 Jul 2009)
@@ -143,8 +143,9 @@
, Attribute& attr) const
{
// create a local value if Attribute is not unused_type
- typename traits::result_of::value<Attribute>::type val =
- typename traits::result_of::value<Attribute>::type();
+ typedef typename traits::result_of::value<Attribute>::type
+ value_type;
+ value_type val = value_type();
typename LoopIter::type i = iter.start();
// parse the minimum required
Modified: trunk/boost/spirit/home/qi/operator/kleene.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/operator/kleene.hpp (original)
+++ trunk/boost/spirit/home/qi/operator/kleene.hpp 2009-07-29 09:50:08 EDT (Wed, 29 Jul 2009)
@@ -58,8 +58,9 @@
, Attribute& attr) const
{
// create a local value if Attribute is not unused_type
- typename traits::result_of::value<Attribute>::type val =
- typename traits::result_of::value<Attribute>::type();
+ typedef typename traits::result_of::value<Attribute>::type
+ value_type;
+ value_type val = value_type();
// Repeat while subject parses ok
while (subject.parse(first, last, context, skipper, val))
Modified: trunk/boost/spirit/home/qi/operator/list.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/operator/list.hpp (original)
+++ trunk/boost/spirit/home/qi/operator/list.hpp 2009-07-29 09:50:08 EDT (Wed, 29 Jul 2009)
@@ -60,8 +60,9 @@
, Attribute& attr) const
{
// create a local value if Attribute is not unused_type
- typename traits::result_of::value<Attribute>::type val =
- typename traits::result_of::value<Attribute>::type();
+ typedef typename traits::result_of::value<Attribute>::type
+ value_type;
+ value_type val = value_type();
if (left.parse(first, last, context, skipper, val))
{
Modified: trunk/boost/spirit/home/qi/operator/plus.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/operator/plus.hpp (original)
+++ trunk/boost/spirit/home/qi/operator/plus.hpp 2009-07-29 09:50:08 EDT (Wed, 29 Jul 2009)
@@ -58,8 +58,9 @@
, Attribute& attr) const
{
// create a local value if Attribute is not unused_type
- typename traits::result_of::value<Attribute>::type val =
- typename traits::result_of::value<Attribute>::type();
+ typedef typename traits::result_of::value<Attribute>::type
+ value_type;
+ value_type val = value_type();
if (subject.parse(first, last, context, skipper, val))
{