boost_mirror/iterator
1
0
Fork 0
mirror of https://github.com/boostorg/iterator.git synced 2025-05-11 05:23:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid including <utility>, added a missing include.

Browse Source
This commit is contained in:
Andrey Semashev 2023-06-22 21:14:03 +03:00
parent d11499c08c
commit 80bb1ac9e4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/iterator/filter_iterator.hpp
View File

@ -13,12 +13,12 @@
#include <boost/type_traits/is_class.hpp> #include <boost/type_traits/is_class.hpp>
#include <boost/static_assert.hpp> #include <boost/static_assert.hpp>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/config/workaround.hpp>
#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
#include <utility> #define BOOST_ITERATOR_DETAIL_MOVE(_type, _value) static_cast< _type&& >(_value)
#define BOOST_ITERATOR_DETAIL_MOVE(x) std::move(x)
#else #else
#define BOOST_ITERATOR_DETAIL_MOVE(x) x #define BOOST_ITERATOR_DETAIL_MOVE(_type, _value) _value
#endif #endif
namespace boost { namespace boost {
@ -62,13 +62,13 @@ namespace iterators {
filter_iterator() { } filter_iterator() { }
filter_iterator(Predicate f, Iterator x, Iterator end_ = Iterator()) filter_iterator(Predicate f, Iterator x, Iterator end_ = Iterator())
: super_t(BOOST_ITERATOR_DETAIL_MOVE(x)), m_predicate(BOOST_ITERATOR_DETAIL_MOVE(f)), m_end(BOOST_ITERATOR_DETAIL_MOVE(end_)) : super_t(BOOST_ITERATOR_DETAIL_MOVE(Iterator, x)), m_predicate(BOOST_ITERATOR_DETAIL_MOVE(Predicate, f)), m_end(BOOST_ITERATOR_DETAIL_MOVE(Iterator, end_))
{ {
satisfy_predicate(); satisfy_predicate();
} }
filter_iterator(Iterator x, Iterator end_ = Iterator()) filter_iterator(Iterator x, Iterator end_ = Iterator())
: super_t(BOOST_ITERATOR_DETAIL_MOVE(x)), m_predicate(), m_end(BOOST_ITERATOR_DETAIL_MOVE(end_)) : super_t(BOOST_ITERATOR_DETAIL_MOVE(Iterator, x)), m_predicate(), m_end(BOOST_ITERATOR_DETAIL_MOVE(Iterator, end_))
{ {
// Pro8 is a little too aggressive about instantiating the // Pro8 is a little too aggressive about instantiating the
// body of this function. // body of this function.
@ -119,7 +119,7 @@ namespace iterators {
inline filter_iterator<Predicate,Iterator> inline filter_iterator<Predicate,Iterator>
make_filter_iterator(Predicate f, Iterator x, Iterator end = Iterator()) make_filter_iterator(Predicate f, Iterator x, Iterator end = Iterator())
{ {
return filter_iterator<Predicate,Iterator>(BOOST_ITERATOR_DETAIL_MOVE(f),BOOST_ITERATOR_DETAIL_MOVE(x),BOOST_ITERATOR_DETAIL_MOVE(end)); return filter_iterator<Predicate,Iterator>(BOOST_ITERATOR_DETAIL_MOVE(Predicate, f), BOOST_ITERATOR_DETAIL_MOVE(Iterator, x), BOOST_ITERATOR_DETAIL_MOVE(Iterator, end));
} }
template <class Predicate, class Iterator> template <class Predicate, class Iterator>
@ -131,7 +131,7 @@ namespace iterators {
>::type x >::type x
, Iterator end = Iterator()) , Iterator end = Iterator())
{ {
return filter_iterator<Predicate,Iterator>(BOOST_ITERATOR_DETAIL_MOVE(x),BOOST_ITERATOR_DETAIL_MOVE(end)); return filter_iterator<Predicate,Iterator>(BOOST_ITERATOR_DETAIL_MOVE(Iterator, x), BOOST_ITERATOR_DETAIL_MOVE(Iterator, end));
} }
} // namespace iterators } // namespace iterators