Make rng | replaced_if consistent with rng | replaced

This commit is contained in:
morinmorin
2017-07-12 22:08:22 +09:00
parent 93eb91e63e
commit 93513a3801

View File

@ -103,13 +103,9 @@ namespace boost
T m_to; T m_to;
}; };
template< class Pred, class SinglePassRange > template< class Pred, class SinglePassRange, class Value >
inline replaced_if_range<Pred, SinglePassRange> inline replaced_if_range<Pred, SinglePassRange>
operator|( operator|(SinglePassRange& r, const replace_if_holder<Pred, Value>& f)
SinglePassRange& r,
const replace_if_holder<
Pred,
BOOST_DEDUCED_TYPENAME range_value<SinglePassRange>::type>& f)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( BOOST_RANGE_CONCEPT_ASSERT((
SinglePassRangeConcept<SinglePassRange>)); SinglePassRangeConcept<SinglePassRange>));
@ -118,13 +114,9 @@ namespace boost
r, f.pred(), f.to()); r, f.pred(), f.to());
} }
template< class Pred, class SinglePassRange > template< class Pred, class SinglePassRange, class Value >
inline replaced_if_range<Pred, const SinglePassRange> inline replaced_if_range<Pred, const SinglePassRange>
operator|( operator|(const SinglePassRange& r, const replace_if_holder<Pred, Value>& f)
const SinglePassRange& r,
const replace_if_holder<
Pred,
BOOST_DEDUCED_TYPENAME range_value<SinglePassRange>::type>& f)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( BOOST_RANGE_CONCEPT_ASSERT((
SinglePassRangeConcept<const SinglePassRange>)); SinglePassRangeConcept<const SinglePassRange>));
@ -145,10 +137,9 @@ namespace boost
range_detail::forwarder2TU<range_detail::replace_if_holder>(); range_detail::forwarder2TU<range_detail::replace_if_holder>();
} }
template<class Pred, class SinglePassRange> template< class Pred, class SinglePassRange, class Value >
inline replaced_if_range<Pred, SinglePassRange> inline replaced_if_range<Pred, SinglePassRange>
replace_if(SinglePassRange& rng, Pred pred, replace_if(SinglePassRange& rng, Pred pred, Value to)
BOOST_DEDUCED_TYPENAME range_value<SinglePassRange>::type to)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( BOOST_RANGE_CONCEPT_ASSERT((
SinglePassRangeConcept<SinglePassRange>)); SinglePassRangeConcept<SinglePassRange>));
@ -157,12 +148,9 @@ namespace boost
rng, pred, to); rng, pred, to);
} }
template<class Pred, class SinglePassRange> template< class Pred, class SinglePassRange, class Value >
inline replaced_if_range<Pred, const SinglePassRange> inline replaced_if_range<Pred, const SinglePassRange>
replace_if( replace_if(const SinglePassRange& rng, Pred pred, Value to)
const SinglePassRange& rng,
Pred pred,
BOOST_DEDUCED_TYPENAME range_value<const SinglePassRange>::type to)
{ {
BOOST_RANGE_CONCEPT_ASSERT(( BOOST_RANGE_CONCEPT_ASSERT((
SinglePassRangeConcept<const SinglePassRange>)); SinglePassRangeConcept<const SinglePassRange>));