generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

istreambuf_iterator increment should call sbumpc instead of snextc. Patch

Browse Source 
by Kimball Thurston.  This fixes http://llvm.org/bugs/show_bug.cgi?id=14358.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@168209 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2012-11-16 22:17:23 +00:00
parent 537b2fa6b8
commit 984f10fdc0
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/iterator
View File

@ -799,7 +799,7 @@ public:
typedef basic_streambuf<_CharT,_Traits> streambuf_type; typedef basic_streambuf<_CharT,_Traits> streambuf_type;
typedef basic_istream<_CharT,_Traits> istream_type; typedef basic_istream<_CharT,_Traits> istream_type;
private: private:
streambuf_type* __sbuf_; mutable streambuf_type* __sbuf_;
class __proxy class __proxy
{ {
@ -813,13 +813,14 @@ private:
}; };
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
void __test_for_eof() bool __test_for_eof() const
{ {
if (__sbuf_ && traits_type::eq_int_type(__sbuf_->sgetc(), traits_type::eof())) if (__sbuf_ && traits_type::eq_int_type(__sbuf_->sgetc(), traits_type::eof()))
__sbuf_ = 0; __sbuf_ = 0;
return __sbuf_ == 0;
} }
public: public:
_LIBCPP_INLINE_VISIBILITY istreambuf_iterator() _NOEXCEPT : __sbuf_(0) {} _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR istreambuf_iterator() _NOEXCEPT : __sbuf_(0) {}
_LIBCPP_INLINE_VISIBILITY istreambuf_iterator(istream_type& __s) _NOEXCEPT _LIBCPP_INLINE_VISIBILITY istreambuf_iterator(istream_type& __s) _NOEXCEPT
: __sbuf_(__s.rdbuf()) {__test_for_eof();} : __sbuf_(__s.rdbuf()) {__test_for_eof();}
_LIBCPP_INLINE_VISIBILITY istreambuf_iterator(streambuf_type* __s) _NOEXCEPT _LIBCPP_INLINE_VISIBILITY istreambuf_iterator(streambuf_type* __s) _NOEXCEPT
@ -832,19 +833,16 @@ public:
_LIBCPP_INLINE_VISIBILITY char_type* operator->() const {return nullptr;} _LIBCPP_INLINE_VISIBILITY char_type* operator->() const {return nullptr;}
_LIBCPP_INLINE_VISIBILITY istreambuf_iterator& operator++() _LIBCPP_INLINE_VISIBILITY istreambuf_iterator& operator++()
{ {
if (traits_type::eq_int_type(__sbuf_->snextc(), traits_type::eof())) __sbuf_->sbumpc();
__sbuf_ = 0;
return *this; return *this;
} }
_LIBCPP_INLINE_VISIBILITY __proxy operator++(int) _LIBCPP_INLINE_VISIBILITY __proxy operator++(int)
{ {
char_type __c = __sbuf_->sgetc(); return __proxy(__sbuf_->sbumpc(), __sbuf_);
++(*this);
return __proxy(__c, __sbuf_);
} }
_LIBCPP_INLINE_VISIBILITY bool equal(const istreambuf_iterator& __b) const _LIBCPP_INLINE_VISIBILITY bool equal(const istreambuf_iterator& __b) const
{return (__sbuf_ == 0) == (__b.__sbuf_ == 0);} {return __test_for_eof() == __b.__test_for_eof();}
}; };
template <class _CharT, class _Traits> template <class _CharT, class _Traits>