boostorg/iterator
1
0
Fork 1
mirror of https://github.com/boostorg/iterator.git synced 2025-07-29 12:27:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merging boost/iterator and libs/iterator trunk to release.

Browse Source 
[SVN r80568]
This commit is contained in:
Jeffrey Lee Hellrung, Jr.
2012-09-18 02:50:52 +00:00
parent c7fc3470d0
commit 9025bbfc2a
4 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/boost/iterator/function_input_iterator.hpp
View File

@ -1,4 +1,6 @@
// Copyright 2009 (C) Dean Michael Berris <me@deanberris.com>
// Copyright 2012 (C) Google, Inc.
// Copyright 2012 (C) Jeffrey Lee Hellrung, Jr.
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
@ -7,11 +9,14 @@
#ifndef BOOST_FUNCTION_INPUT_ITERATOR
#define BOOST_FUNCTION_INPUT_ITERATOR
#include <boost/assert.hpp>
#include <boost/mpl/if.hpp>
#include <boost/function_types/is_function_pointer.hpp>
#include <boost/function_types/is_function_reference.hpp>
#include <boost/function_types/result_type.hpp>
#include <boost/iterator/iterator_facade.hpp>
#include <boost/none.hpp>
#include <boost/optional/optional.hpp>
namespace boost {
@ -29,16 +34,17 @@ namespace boost {
public:
function_input_iterator() {}
function_input_iterator(Function & f_, Input state_ = Input())
: f(&f_), state(state_), value((*f)()) {}
: f(&f_), state(state_) {}
void increment() {
value = (*f)();
BOOST_ASSERT(value);
value = none;
++state;
}
typename Function::result_type const &
dereference() const {
return value;
return (value ? value : value = (*f)()).get();
}
bool equal(function_input_iterator const & other) const {
@ -48,7 +54,7 @@ namespace boost {
private:
Function * f;
Input state;
typename Function::result_type value;
mutable optional<typename Function::result_type> value;
};
template <class Function, class Input>
@ -63,17 +69,17 @@ namespace boost {
public:
function_pointer_input_iterator() {}
function_pointer_input_iterator(Function &f_, Input state_ = Input())
: f(f_), state(state_), value((*f)())
{}
: f(f_), state(state_) {}
void increment() {
value = (*f)();
BOOST_ASSERT(value);
value = none;
++state;
}
typename function_types::result_type<Function>::type const &
dereference() const {
return value;
return (value ? value : value = (*f)()).get();
}
bool equal(function_pointer_input_iterator const & other) const {
@ -83,7 +89,7 @@ namespace boost {
private:
Function f;
Input state;
typename function_types::result_type<Function>::type value;
mutable optional<typename function_types::result_type<Function>::type> value;
};
template <class Function, class Input>

2
include/boost/iterator/reverse_iterator.hpp
View File

@ -7,8 +7,8 @@
#ifndef BOOST_REVERSE_ITERATOR_23022003THW_HPP
#define BOOST_REVERSE_ITERATOR_23022003THW_HPP
#include <boost/next_prior.hpp>
#include <boost/iterator.hpp>
#include <boost/utility.hpp>
#include <boost/iterator/iterator_adaptor.hpp>
namespace boost