Subject: [Boost-commit] svn:boost r82574 - in branches/release: . boost boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/karma/detail libs libs/spirit libs/spirit/test libs/spirit/test/karma
From: hartmut.kaiser_at_[hidden]
Date: 2013-01-20 18:59:22
Author: hkaiser
Date: 2013-01-20 18:59:21 EST (Sun, 20 Jan 2013)
New Revision: 82574
URL: http://svn.boost.org/trac/boost/changeset/82574
Log:
Spirit: merging from trunk
Added:
branches/release/libs/spirit/test/karma/regression_iterator.cpp
- copied unchanged from r82521, /trunk/libs/spirit/test/karma/regression_iterator.cpp
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/boost/spirit/ (props changed)
branches/release/boost/spirit/home/ (props changed)
branches/release/boost/spirit/home/karma/ (props changed)
branches/release/libs/ (props changed)
branches/release/libs/spirit/ (props changed)
branches/release/libs/spirit/test/ (props changed)
Text files modified:
branches/release/boost/spirit/home/karma/detail/indirect_iterator.hpp | 8 +++++---
branches/release/libs/spirit/test/Jamfile | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
Modified: branches/release/boost/spirit/home/karma/detail/indirect_iterator.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/detail/indirect_iterator.hpp (original)
+++ branches/release/boost/spirit/home/karma/detail/indirect_iterator.hpp 2013-01-20 18:59:21 EST (Sun, 20 Jan 2013)
@@ -25,14 +25,16 @@
indirect_iterator<Iterator>
, typename boost::detail::iterator_traits<Iterator>::value_type
, boost::forward_traversal_tag
- , typename boost::detail::iterator_traits<Iterator>::value_type const&>
+ , typename boost::detail::iterator_traits<Iterator>::reference>
{
typedef typename boost::detail::iterator_traits<Iterator>::value_type
base_value_type;
+ typedef typename boost::detail::iterator_traits<Iterator>::reference
+ base_reference_type;
typedef boost::iterator_facade<
indirect_iterator<Iterator>, base_value_type
- , boost::forward_traversal_tag, base_value_type const&
+ , boost::forward_traversal_tag, base_reference_type
> base_type;
public:
@@ -56,7 +58,7 @@
return *iter_ == *other.iter_;
}
- typename base_type::reference dereference() const
+ base_reference_type dereference() const
{
return **iter_;
}
Modified: branches/release/libs/spirit/test/Jamfile
==============================================================================
--- branches/release/libs/spirit/test/Jamfile (original)
+++ branches/release/libs/spirit/test/Jamfile 2013-01-20 18:59:21 EST (Sun, 20 Jan 2013)
@@ -254,6 +254,7 @@
[ run karma/regression_container_variant_sequence.cpp : : : : karma_regression_container_variant_sequence ]
[ run karma/regression_real_0.cpp : : : : karma_regression_real_0 ]
[ run karma/regression_unicode_char.cpp : : : : karma_regression_unicode_char ]
+ [ run karma/regression_iterator.cpp : : : : karma_regression_iterator ]
;