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

[range] Fixed a bug in istream_range() that prevented it from working with character types other than 'char' (refs #7407).

Browse Source 
[SVN r84707]
This commit is contained in:
Nathan Ridge
2013-06-09 02:34:36 +00:00
parent 8be23dd1aa
commit b0c1cf556f
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,8 +27,8 @@ namespace boost
istream_range(std::basic_istream<Elem, Traits>& in) istream_range(std::basic_istream<Elem, Traits>& in)
{ {
return iterator_range<std::istream_iterator<Type, Elem, Traits> >( return iterator_range<std::istream_iterator<Type, Elem, Traits> >(
std::istream_iterator<Type>(in), std::istream_iterator<Type, Elem, Traits>(in),
std::istream_iterator<Type>()); std::istream_iterator<Type, Elem, Traits>());
} }
} // namespace range } // namespace range
using range::istream_range; using range::istream_range;

15
test/istream_range.cpp
View File

@ -19,15 +19,15 @@
namespace namespace
{ {
// Test an integer range with a step size of 1. template <typename CharT>
void test_istream_range() void test_istream_range_impl()
{ {
std::stringstream s; std::basic_stringstream<CharT> s;
std::vector<int> reference; std::vector<int> reference;
for (int i = 0; i < 10; ++i) for (int i = 0; i < 10; ++i)
{ {
reference.push_back(i); reference.push_back(i);
s << i << " "; s << i << CharT(' ');
} }
std::vector<int> target; std::vector<int> target;
@ -36,6 +36,13 @@ namespace
BOOST_CHECK_EQUAL_COLLECTIONS( reference.begin(), reference.end(), BOOST_CHECK_EQUAL_COLLECTIONS( reference.begin(), reference.end(),
target.begin(), target.end() ); target.begin(), target.end() );
} }
// Test an istream range.
void test_istream_range()
{
test_istream_range_impl<char>();
test_istream_range_impl<wchar_t>();
}
} // namespace anonymous namespace } // namespace anonymous namespace