forked from boostorg/range
[boost][range] - merge from trunk of miscellaneous defect fixes
[SVN r72427]
This commit is contained in:
66
include/boost/range/algorithm/for_each.hpp
Executable file → Normal file
66
include/boost/range/algorithm/for_each.hpp
Executable file → Normal file
@ -13,13 +13,53 @@
|
||||
#include <boost/range/begin.hpp>
|
||||
#include <boost/range/end.hpp>
|
||||
#include <boost/range/concepts.hpp>
|
||||
#include <boost/ref.hpp>
|
||||
#include <boost/utility.hpp>
|
||||
#include <algorithm>
|
||||
|
||||
#if BOOST_WORKAROUND(BOOST_MSVC, == 1600)
|
||||
#include <xutility>
|
||||
#endif
|
||||
|
||||
namespace boost
|
||||
{
|
||||
namespace range
|
||||
{
|
||||
|
||||
#if BOOST_WORKAROUND(BOOST_MSVC, == 1600)
|
||||
namespace for_each_detail
|
||||
{
|
||||
template<typename Iterator, typename UnaryFunction>
|
||||
inline UnaryFunction
|
||||
for_each_impl(Iterator first, Iterator last, UnaryFunction fun,
|
||||
typename enable_if<
|
||||
is_reference_wrapper<UnaryFunction>,
|
||||
void
|
||||
>::type* = 0)
|
||||
{
|
||||
typedef typename std::_Get_unchecked_type<Iterator>::type
|
||||
unchecked_iterator;
|
||||
|
||||
unchecked_iterator unchecked_last = std::_Unchecked(last);
|
||||
for (unchecked_iterator unchecked_first = std::_Unchecked(first); first != last; ++first)
|
||||
fun.get()(*unchecked_first);
|
||||
|
||||
return fun;
|
||||
}
|
||||
|
||||
template<typename Iterator, typename UnaryFunction>
|
||||
inline UnaryFunction
|
||||
for_each_impl(Iterator first, Iterator last, UnaryFunction fn,
|
||||
typename disable_if<
|
||||
is_reference_wrapper<UnaryFunction>,
|
||||
void
|
||||
>::type* = 0)
|
||||
{
|
||||
return std::for_each<Iterator, UnaryFunction>(first, last, fn);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/// \brief template function for_each
|
||||
///
|
||||
/// range-based version of the for_each std algorithm
|
||||
@ -30,7 +70,18 @@ template< class SinglePassRange, class UnaryFunction >
|
||||
inline UnaryFunction for_each(SinglePassRange & rng, UnaryFunction fun)
|
||||
{
|
||||
BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept<SinglePassRange> ));
|
||||
return std::for_each(boost::begin(rng),boost::end(rng),fun);
|
||||
|
||||
#if BOOST_WORKAROUND(BOOST_MSVC, == 1600)
|
||||
return for_each_detail::for_each_impl<
|
||||
typename range_iterator<SinglePassRange>::type,
|
||||
UnaryFunction
|
||||
>(boost::begin(rng), boost::end(rng), fun);
|
||||
#else
|
||||
return std::for_each<
|
||||
BOOST_DEDUCED_TYPENAME range_iterator<SinglePassRange>::type,
|
||||
UnaryFunction
|
||||
>(boost::begin(rng),boost::end(rng),fun);
|
||||
#endif
|
||||
}
|
||||
|
||||
/// \overload
|
||||
@ -38,7 +89,18 @@ template< class SinglePassRange, class UnaryFunction >
|
||||
inline UnaryFunction for_each(const SinglePassRange& rng, UnaryFunction fun)
|
||||
{
|
||||
BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept<const SinglePassRange> ));
|
||||
return std::for_each(boost::begin(rng), boost::end(rng), fun);
|
||||
|
||||
#if BOOST_WORKAROUND(BOOST_MSVC, == 1600)
|
||||
return for_each_detail::for_each_impl<
|
||||
typename range_iterator<const SinglePassRange>::type,
|
||||
UnaryFunction
|
||||
>(boost::begin(rng), boost::end(rng), fun);
|
||||
#else
|
||||
return std::for_each<
|
||||
BOOST_DEDUCED_TYPENAME range_iterator<const SinglePassRange>::type,
|
||||
UnaryFunction
|
||||
>(boost::begin(rng), boost::end(rng), fun);
|
||||
#endif
|
||||
}
|
||||
|
||||
} // namespace range
|
||||
|
Reference in New Issue
Block a user