feedc0de/boost_range
1
0
Fork 0
forked from boostorg/range
Code Pull Requests Activity

Replace std::min_element/max_element with boost::first_min_element/first_max_element to accept a range that models ForwardRange but its underlying iterator models only InputIterator; fixes ticket 11528.

Browse Source
This commit is contained in:
morinmorin
2015-08-20 20:03:08 +09:00
parent 7fad9837fb
commit adcb071dc6
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/boost/range/algorithm/max_element.hpp
View File

@ -9,12 +9,12 @@
#ifndef BOOST_RANGE_ALGORITHM_MAX_ELEMENT_HPP_INCLUDED #ifndef BOOST_RANGE_ALGORITHM_MAX_ELEMENT_HPP_INCLUDED
#define BOOST_RANGE_ALGORITHM_MAX_ELEMENT_HPP_INCLUDED #define BOOST_RANGE_ALGORITHM_MAX_ELEMENT_HPP_INCLUDED
#include <boost/algorithm/minmax_element.hpp>
#include <boost/concept_check.hpp> #include <boost/concept_check.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
#include <boost/range/end.hpp> #include <boost/range/end.hpp>
#include <boost/range/concepts.hpp> #include <boost/range/concepts.hpp>
#include <boost/range/detail/range_return.hpp> #include <boost/range/detail/range_return.hpp>
#include <algorithm>
namespace boost namespace boost
{ {
@ -32,7 +32,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<ForwardRange>::type
max_element(ForwardRange& rng) max_element(ForwardRange& rng)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
return std::max_element(boost::begin(rng), boost::end(rng)); return boost::first_max_element(boost::begin(rng), boost::end(rng));
} }
/// \overload /// \overload
@ -41,7 +41,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<const ForwardRange>::type
max_element(const ForwardRange& rng) max_element(const ForwardRange& rng)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
return std::max_element(boost::begin(rng), boost::end(rng)); return boost::first_max_element(boost::begin(rng), boost::end(rng));
} }
/// \overload /// \overload
@ -50,7 +50,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<ForwardRange>::type
max_element(ForwardRange& rng, BinaryPredicate pred) max_element(ForwardRange& rng, BinaryPredicate pred)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
return std::max_element(boost::begin(rng), boost::end(rng), pred); return boost::first_max_element(boost::begin(rng), boost::end(rng), pred);
} }
/// \overload /// \overload
@ -59,7 +59,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<const ForwardRange>::type
max_element(const ForwardRange& rng, BinaryPredicate pred) max_element(const ForwardRange& rng, BinaryPredicate pred)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
return std::max_element(boost::begin(rng), boost::end(rng), pred); return boost::first_max_element(boost::begin(rng), boost::end(rng), pred);
} }
// range_return overloads // range_return overloads
@ -71,7 +71,7 @@ max_element(ForwardRange& rng)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
return range_return<ForwardRange,re>::pack( return range_return<ForwardRange,re>::pack(
std::max_element(boost::begin(rng), boost::end(rng)), boost::first_max_element(boost::begin(rng), boost::end(rng)),
rng); rng);
} }
@ -82,7 +82,7 @@ max_element(const ForwardRange& rng)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
return range_return<const ForwardRange,re>::pack( return range_return<const ForwardRange,re>::pack(
std::max_element(boost::begin(rng), boost::end(rng)), boost::first_max_element(boost::begin(rng), boost::end(rng)),
rng); rng);
} }
@ -93,7 +93,7 @@ max_element(ForwardRange& rng, BinaryPredicate pred)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
return range_return<ForwardRange,re>::pack( return range_return<ForwardRange,re>::pack(
std::max_element(boost::begin(rng), boost::end(rng), pred), boost::first_max_element(boost::begin(rng), boost::end(rng), pred),
rng); rng);
} }
@ -104,7 +104,7 @@ max_element(const ForwardRange& rng, BinaryPredicate pred)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
return range_return<const ForwardRange,re>::pack( return range_return<const ForwardRange,re>::pack(
std::max_element(boost::begin(rng), boost::end(rng), pred), boost::first_max_element(boost::begin(rng), boost::end(rng), pred),
rng); rng);
} }

18
include/boost/range/algorithm/min_element.hpp
View File

@ -9,12 +9,12 @@
#ifndef BOOST_RANGE_ALGORITHM_MIN_ELEMENT_HPP_INCLUDED #ifndef BOOST_RANGE_ALGORITHM_MIN_ELEMENT_HPP_INCLUDED
#define BOOST_RANGE_ALGORITHM_MIN_ELEMENT_HPP_INCLUDED #define BOOST_RANGE_ALGORITHM_MIN_ELEMENT_HPP_INCLUDED
#include <boost/algorithm/minmax_element.hpp>
#include <boost/concept_check.hpp> #include <boost/concept_check.hpp>
#include <boost/range/begin.hpp> #include <boost/range/begin.hpp>
#include <boost/range/end.hpp> #include <boost/range/end.hpp>
#include <boost/range/concepts.hpp> #include <boost/range/concepts.hpp>
#include <boost/range/detail/range_return.hpp> #include <boost/range/detail/range_return.hpp>
#include <algorithm>
namespace boost namespace boost
{ {
@ -32,7 +32,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<ForwardRange>::type
min_element(ForwardRange& rng) min_element(ForwardRange& rng)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
return std::min_element(boost::begin(rng), boost::end(rng)); return boost::first_min_element(boost::begin(rng), boost::end(rng));
} }
/// \overload /// \overload
@ -41,7 +41,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<const ForwardRange>::type
min_element(const ForwardRange& rng) min_element(const ForwardRange& rng)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
return std::min_element(boost::begin(rng), boost::end(rng)); return boost::first_min_element(boost::begin(rng), boost::end(rng));
} }
/// \overload /// \overload
@ -50,7 +50,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<ForwardRange>::type
min_element(ForwardRange& rng, BinaryPredicate pred) min_element(ForwardRange& rng, BinaryPredicate pred)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
return std::min_element(boost::begin(rng), boost::end(rng), pred); return boost::first_min_element(boost::begin(rng), boost::end(rng), pred);
} }
/// \overload /// \overload
@ -59,7 +59,7 @@ inline BOOST_DEDUCED_TYPENAME range_iterator<const ForwardRange>::type
min_element(const ForwardRange& rng, BinaryPredicate pred) min_element(const ForwardRange& rng, BinaryPredicate pred)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
return std::min_element(boost::begin(rng), boost::end(rng), pred); return boost::first_min_element(boost::begin(rng), boost::end(rng), pred);
} }
// range_return overloads // range_return overloads
@ -71,7 +71,7 @@ min_element(ForwardRange& rng)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
return range_return<ForwardRange,re>::pack( return range_return<ForwardRange,re>::pack(
std::min_element(boost::begin(rng), boost::end(rng)), boost::first_min_element(boost::begin(rng), boost::end(rng)),
rng); rng);
} }
@ -82,7 +82,7 @@ min_element(const ForwardRange& rng)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
return range_return<const ForwardRange,re>::pack( return range_return<const ForwardRange,re>::pack(
std::min_element(boost::begin(rng), boost::end(rng)), boost::first_min_element(boost::begin(rng), boost::end(rng)),
rng); rng);
} }
@ -93,7 +93,7 @@ min_element(ForwardRange& rng, BinaryPredicate pred)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
return range_return<ForwardRange,re>::pack( return range_return<ForwardRange,re>::pack(
std::min_element(boost::begin(rng), boost::end(rng), pred), boost::first_min_element(boost::begin(rng), boost::end(rng), pred),
rng); rng);
} }
@ -104,7 +104,7 @@ min_element(const ForwardRange& rng, BinaryPredicate pred)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> )); BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<const ForwardRange> ));
return range_return<const ForwardRange,re>::pack( return range_return<const ForwardRange,re>::pack(
std::min_element(boost::begin(rng), boost::end(rng), pred), boost::first_min_element(boost::begin(rng), boost::end(rng), pred),
rng); rng);
} }