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

Merge pull request #34 from morinmorin/fix_result_of_usage

Browse Source 
Fix result_of usage
This commit is contained in:
Andrey Semashev
2017-09-11 23:44:36 +03:00
committed by GitHub
parent e2f81e9b48 d058933767
commit 07afd26ca2
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,19 +20,38 @@
#include <boost/optional/optional.hpp> #include <boost/optional/optional.hpp>
#include <boost/utility/result_of.hpp> #include <boost/utility/result_of.hpp>
#ifdef BOOST_RESULT_OF_USE_TR1
#include <boost/type_traits/is_function.hpp>
#endif
namespace boost { namespace boost {
namespace iterators { namespace iterators {
namespace impl { namespace impl {
// Computes the return type of an lvalue-call with an empty argument,
// i.e. decltype(declval<F&>()()). F should be a nullary lvalue-callable
// or function.
template <class F>
struct result_of_nullary_lvalue_call
{
typedef typename result_of<
#ifdef BOOST_RESULT_OF_USE_TR1
typename mpl::if_<is_function<F>, F&, F>::type()
#else
F&()
#endif
>::type type;
};
template <class Function, class Input> template <class Function, class Input>
class function_input_iterator class function_input_iterator
: public iterator_facade< : public iterator_facade<
function_input_iterator<Function, Input>, function_input_iterator<Function, Input>,
typename result_of<Function ()>::type, typename result_of_nullary_lvalue_call<Function>::type,
single_pass_traversal_tag, single_pass_traversal_tag,
typename result_of<Function ()>::type const & typename result_of_nullary_lvalue_call<Function>::type const &
> >
{ {
public: public:
@ -48,7 +67,7 @@ namespace iterators {
++state; ++state;
} }
typename result_of<Function ()>::type const & typename result_of_nullary_lvalue_call<Function>::type const &
dereference() const { dereference() const {
return (value ? value : value = (*f)()).get(); return (value ? value : value = (*f)()).get();
} }
@ -60,7 +79,7 @@ namespace iterators {
private: private:
Function * f; Function * f;
Input state; Input state;
mutable optional<typename result_of<Function ()>::type> value; mutable optional<typename result_of_nullary_lvalue_call<Function>::type> value;
}; };
template <class Function, class Input> template <class Function, class Input>