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

Boost.Range correct missing items from merge by merging these changes manually.

Browse Source 
This changeset is what should have happened with the prior svn merge operation.

[SVN r61519]
This commit is contained in:
Neil Groves
2010-04-23 23:18:59 +00:00
parent a47f15a98f
commit f9eeb5d447
6 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/boost/range/algorithm/fill_n.hpp
View File

@ -26,6 +26,7 @@ namespace boost
/// range-based version of the fill_n std algorithm
///
/// \pre ForwardRange is a model of the ForwardRangeConcept
/// \pre n <= std::distance(boost::begin(rng), boost::end(rng))
template< class ForwardRange, class Size, class Value >
inline ForwardRange& fill_n(ForwardRange& rng, Size n, const Value& val)
{

9
include/boost/range/algorithm_ext/erase.hpp
View File

@ -24,29 +24,32 @@ namespace boost
{
template< class Container >
inline void erase( Container& on,
inline Container& erase( Container& on,
iterator_range<BOOST_DEDUCED_TYPENAME Container::iterator> to_erase )
{
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<Container> ));
on.erase( boost::begin(to_erase), boost::end(to_erase) );
return on;
}
template< class Container, class T >
inline void remove_erase( Container& on, const T& val )
inline Container& remove_erase( Container& on, const T& val )
{
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<Container> ));
on.erase(
std::remove(boost::begin(on), boost::end(on), val),
boost::end(on));
return on;
}
template< class Container, class Pred >
inline void remove_erase_if( Container& on, Pred pred )
inline Container& remove_erase_if( Container& on, Pred pred )
{
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<Container> ));
on.erase(
std::remove_if(boost::begin(on), boost::end(on), pred),
boost::end(on));
return on;
}
} // namespace range

7
include/boost/range/algorithm_ext/insert.hpp
View File

@ -23,15 +23,16 @@ namespace boost
{
template< class Container, class Range >
inline void insert( Container& on,
BOOST_DEDUCED_TYPENAME Container::iterator before,
const Range& from )
inline Container& insert( Container& on,
BOOST_DEDUCED_TYPENAME Container::iterator before,
const Range& from )
{
BOOST_RANGE_CONCEPT_ASSERT(( ForwardRangeConcept<Container> ));
BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept<Range> ));
BOOST_ASSERT( (void*)&on != (void*)&from &&
"cannot copy from a container to itself" );
on.insert( before, boost::begin(from), boost::end(from) );
return on;
}
} // namespace range

4
include/boost/range/algorithm_ext/iota.hpp
View File

@ -22,7 +22,7 @@ namespace boost
{
template< class ForwardRange, class Value >
inline void iota( ForwardRange& rng, Value x )
inline ForwardRange& iota( ForwardRange& rng, Value x )
{
BOOST_CONCEPT_ASSERT(( ForwardRangeConcept<ForwardRange> ));
typedef BOOST_DEDUCED_TYPENAME range_iterator<ForwardRange>::type iterator_t;
@ -30,6 +30,8 @@ inline void iota( ForwardRange& rng, Value x )
iterator_t last_target = ::boost::end(rng);
for (iterator_t target = ::boost::begin(rng); target != last_target; ++target, ++x)
*target = x;
return rng;
}
} // namespace range

3
include/boost/range/algorithm_ext/push_back.hpp
View File

@ -23,13 +23,14 @@ namespace boost
{
template< class Container, class Range >
inline void push_back( Container& on, const Range& from )
inline Container& push_back( Container& on, const Range& from )
{
BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept<Container> ));
BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept<const Range> ));
BOOST_ASSERT( (void*)&on != (void*)&from &&
"cannot copy from a container to itself" );
on.insert( on.end(), boost::begin(from), boost::end(from) );
return on;
}
} // namespace range

3
include/boost/range/algorithm_ext/push_front.hpp
View File

@ -23,13 +23,14 @@ namespace boost
{
template< class Container, class Range >
inline void push_front( Container& on, const Range& from )
inline Container& push_front( Container& on, const Range& from )
{
BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept<Container> ));
BOOST_RANGE_CONCEPT_ASSERT(( SinglePassRangeConcept<const Range> ));
BOOST_ASSERT( (void*)&on != (void*)&from &&
"cannot copy from a container to itself" );
on.insert( on.begin(), boost::begin(from), boost::end(from) );
return on;
}
} // namespace range