forked from boostorg/range
Boost.Range sliced adaptor is now compatible with VC10 even with using namespace boost::adaptors.
[SVN r61923]
This commit is contained in:
@ -28,14 +28,26 @@ namespace boost
|
|||||||
};
|
};
|
||||||
|
|
||||||
template< class RandomAccessRange >
|
template< class RandomAccessRange >
|
||||||
inline iterator_range< BOOST_DEDUCED_TYPENAME range_iterator<RandomAccessRange>::type >
|
class sliced_range : public boost::iterator_range< BOOST_DEDUCED_TYPENAME range_iterator<RandomAccessRange>::type >
|
||||||
|
{
|
||||||
|
typedef boost::iterator_range< BOOST_DEDUCED_TYPENAME range_iterator<RandomAccessRange>::type > base_t;
|
||||||
|
public:
|
||||||
|
template<typename Rng, typename T, typename U>
|
||||||
|
sliced_range(Rng& rng, T t, U u)
|
||||||
|
: base_t(boost::make_iterator_range(rng, t, u - boost::size(rng)))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template< class RandomAccessRange >
|
||||||
|
inline sliced_range<RandomAccessRange>
|
||||||
slice( RandomAccessRange& rng, std::size_t t, std::size_t u )
|
slice( RandomAccessRange& rng, std::size_t t, std::size_t u )
|
||||||
{
|
{
|
||||||
BOOST_ASSERT( t <= u && "error in slice indices" );
|
BOOST_ASSERT( t <= u && "error in slice indices" );
|
||||||
BOOST_ASSERT( static_cast<std::size_t>(boost::size(rng)) >= u &&
|
BOOST_ASSERT( static_cast<std::size_t>(boost::size(rng)) >= u &&
|
||||||
"second slice index out of bounds" );
|
"second slice index out of bounds" );
|
||||||
|
|
||||||
return boost::make_iterator_range( rng, t, u - boost::size(rng) );
|
return sliced_range<RandomAccessRange>(rng, t, u);
|
||||||
}
|
}
|
||||||
|
|
||||||
template< class RandomAccessRange >
|
template< class RandomAccessRange >
|
||||||
@ -46,23 +58,21 @@ namespace boost
|
|||||||
BOOST_ASSERT( static_cast<std::size_t>(boost::size(rng)) >= u &&
|
BOOST_ASSERT( static_cast<std::size_t>(boost::size(rng)) >= u &&
|
||||||
"second slice index out of bounds" );
|
"second slice index out of bounds" );
|
||||||
|
|
||||||
return boost::make_iterator_range( rng, t, u - boost::size(rng) );
|
return sliced_range<const RandomAccessRange>(rng, t, u);
|
||||||
}
|
}
|
||||||
|
|
||||||
template< class RandomAccessRange >
|
template< class RandomAccessRange >
|
||||||
inline iterator_range<
|
inline sliced_range<RandomAccessRange>
|
||||||
BOOST_DEDUCED_TYPENAME range_iterator<RandomAccessRange>::type >
|
|
||||||
operator|( RandomAccessRange& r, const sliced& f )
|
operator|( RandomAccessRange& r, const sliced& f )
|
||||||
{
|
{
|
||||||
return adaptors::slice( r, f.t, f.u );
|
return sliced_range<RandomAccessRange>( r, f.t, f.u );
|
||||||
}
|
}
|
||||||
|
|
||||||
template< class RandomAccessRange >
|
template< class RandomAccessRange >
|
||||||
inline iterator_range<
|
inline sliced_range<const RandomAccessRange>
|
||||||
BOOST_DEDUCED_TYPENAME range_iterator<const RandomAccessRange>::type >
|
|
||||||
operator|( const RandomAccessRange& r, const sliced& f )
|
operator|( const RandomAccessRange& r, const sliced& f )
|
||||||
{
|
{
|
||||||
return adaptors::slice( r, f.t, f.u );
|
return sliced_range<const RandomAccessRange>( r, f.t, f.u );
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace adaptors
|
} // namespace adaptors
|
||||||
|
Reference in New Issue
Block a user