Subject: [Boost-commit] svn:boost r77576 - in branches/release/boost/archive: . iterators
From: ramey_at_[hidden]
Date: 2012-03-26 18:45:18
Author: ramey
Date: 2012-03-26 18:45:17 EDT (Mon, 26 Mar 2012)
New Revision: 77576
URL: http://svn.boost.org/trac/boost/changeset/77576
Log:
Merged trunk to release
Properties modified:
branches/release/boost/archive/ (props changed)
Text files modified:
branches/release/boost/archive/iterators/head_iterator.hpp | 4 ++--
branches/release/boost/archive/iterators/remove_whitespace.hpp | 11 +++++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
Modified: branches/release/boost/archive/iterators/head_iterator.hpp
==============================================================================
--- branches/release/boost/archive/iterators/head_iterator.hpp (original)
+++ branches/release/boost/archive/iterators/head_iterator.hpp 2012-03-26 18:45:17 EDT (Mon, 26 Mar 2012)
@@ -42,8 +42,8 @@
> super_t;
typedef head_iterator<Predicate, Base> this_t;
- typedef BOOST_DEDUCED_TYPENAME super_t::value_type value_type;
- typedef BOOST_DEDUCED_TYPENAME super_t::reference reference_type;
+ typedef super_t::value_type value_type;
+ typedef super_t::reference reference_type;
reference_type dereference_impl(){
if(! m_end){
Modified: branches/release/boost/archive/iterators/remove_whitespace.hpp
==============================================================================
--- branches/release/boost/archive/iterators/remove_whitespace.hpp (original)
+++ branches/release/boost/archive/iterators/remove_whitespace.hpp 2012-03-26 18:45:17 EDT (Mon, 26 Mar 2012)
@@ -24,6 +24,7 @@
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/iterator/filter_iterator.hpp>
+#include <boost/iterator/iterator_traits.hpp>
//#include <boost/detail/workaround.hpp>
//#if ! BOOST_WORKAROUND(BOOST_MSVC, <=1300)
@@ -140,13 +141,19 @@
template<class Base>
class remove_whitespace :
public filter_iterator<
- remove_whitespace_predicate<BOOST_DEDUCED_TYPENAME Base::value_type>,
+ remove_whitespace_predicate<
+ BOOST_DEDUCED_TYPENAME boost::iterator_value<Base>::type
+ //BOOST_DEDUCED_TYPENAME Base::value_type
+ >,
Base
>
{
friend class boost::iterator_core_access;
typedef filter_iterator<
- remove_whitespace_predicate<BOOST_DEDUCED_TYPENAME Base::value_type>,
+ remove_whitespace_predicate<
+ BOOST_DEDUCED_TYPENAME boost::iterator_value<Base>::type
+ //BOOST_DEDUCED_TYPENAME Base::value_type
+ >,
Base
> super_t;
public: