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

Boost.Range corrected istream_range implementation. Added the missing istream_range unit test. Removed the untested and undocumented unbounded_range for this release.

Browse Source 
[SVN r61345]
This commit is contained in:
Neil Groves
2010-04-17 21:02:28 +00:00
parent cf63ba0dc9
commit 4830359a93
4 changed files with 66 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/boost/range/istream_range.hpp
View File

@@ -16,19 +16,24 @@
*/
#include <iterator>
#include <istream>
#include <boost/config.hpp>
#include <boost/range/range.hpp>
#include <boost/range/iterator_range.hpp>
namespace boost
{
template<class Type, class Elem, class Traits> inline
range<std::istream_iterator<Type, Elem, Traits> >
istream_range(std::basic_istream<Elem, Traits>& in)
{
return range<std::istream_iterator<Type, Elem, Traits> >(
std::istream_iterator<Type>(in),
std::istream_iterator<Type>());
}
namespace range
{
template<class Type, class Elem, class Traits> inline
iterator_range<std::istream_iterator<Type, Elem, Traits> >
istream_range(std::basic_istream<Elem, Traits>& in)
{
return iterator_range<std::istream_iterator<Type, Elem, Traits> >(
std::istream_iterator<Type>(in),
std::istream_iterator<Type>());
}
} // namespace range
using range::istream_range;
} // namespace boost
#endif // include guard

73
include/boost/range/unbounded_range.hpp
View File

@@ -1,73 +0,0 @@
#ifndef BOOST_RANGE_UNBOUNDED_RANGE_HPP
#define BOOST_RANGE_UNBOUNDED_RANGE_HPP
#include <boost/range/iterator_range.hpp>
#include <boost/config.hpp>
namespace boost
{
template< class Iter >
struct unbounded_iterator_range : iterator_range<Iter>
{
explicit unbounded_iterator_range( Iter r )
: iterator_range<Iter>( r, r )
{
//
// Remark: by storing the same iterator
// twice, we can still allow
// comparison to execute without leading to
// operations on singular iterators
//
}
private:
bool empty() const
{
return false;
}
//
// Hide members that are illegal to use.
//
/*
void end() const;
void size() const;
void empty() const;
void equal() const;
operator bool() const;
bool operator==( unbounded_iterator_range );
bool operator!=( unbounded_iterator_range );
template< class S >
void operator[]( S s ) const;
template< class D >
void advance_end( D d ) const;
void back() const;
*/
};
template< class Iter >
inline unbounded_iterator_range<Iter> unbounded_range( Iter r )
{
return unbounded_iterator_range<Iter>(r);
}
namespace detail
{
char is_unbounded_range( ... );
template< class Iter >
long is_unbounded_range( const unbounded_iterator_range<Iter>* );
}
template< class T >
struct is_unbounded_range
{
private:
static T* ptr_;
public:
BOOST_STATIC_CONSTANT( bool,
value = sizeof(long) == sizeof(detail::is_unbounded_range(ptr_) ) );
};
}
#endif