diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-05 00:18:07 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-09-05 00:18:07 +0000 |
| commit | aae73f19554bb8b9300d66568f0f2782149fc8dd (patch) | |
| tree | 4dedf30fa3cf818d3f6a7e924c0cc825124ae145 /libstdc++-v3/src/istream.cc | |
| parent | 44336c7828e5816b8e5bcf7edace7191070c3a8b (diff) | |
| download | gcc-aae73f19554bb8b9300d66568f0f2782149fc8dd.tar.gz | |
2009-09-04 Benjamin Kosnik <bkoz@redhat.com>
Revert.
2009-08-06 Benjamin Kosnik <bkoz@redhat.com>
* src/compatibility.cc: Make C++0x safe, add in explicit casts to
bool for stream sentry objects.
* include/bits/istream.tcc: Same.
* include/bits/ostream.tcc: Same.
* include/bits/basic_string.tcc: Same.
* include/bits/ostream_insert.h: Same.
* src/istream.cc: Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151445 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src/istream.cc')
| -rw-r--r-- | libstdc++-v3/src/istream.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libstdc++-v3/src/istream.cc b/libstdc++-v3/src/istream.cc index 0e7cbfb9084..e4102779aa8 100644 --- a/libstdc++-v3/src/istream.cc +++ b/libstdc++-v3/src/istream.cc @@ -39,7 +39,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_gcount = 0; ios_base::iostate __err = ios_base::goodbit; sentry __cerb(*this, true); - if (static_cast<bool>(__cerb)) + if (__cerb) { __try { @@ -116,7 +116,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_gcount = 0; sentry __cerb(*this, true); - if (__n > 0 && static_cast<bool>(__cerb)) + if (__n > 0 && __cerb) { ios_base::iostate __err = ios_base::goodbit; __try @@ -205,7 +205,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) streamsize __extracted = 0; ios_base::iostate __err = ios_base::goodbit; __istream_type::sentry __cerb(__in, false); - if (static_cast<bool>(__cerb)) + if (__cerb) { __try { @@ -288,7 +288,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __size_type __extracted = 0; ios_base::iostate __err = ios_base::goodbit; __istream_type::sentry __cerb(__in, false); - if (static_cast<bool>(__cerb)) + if (__cerb) { __try { @@ -370,7 +370,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const __size_type __n = __str.max_size(); ios_base::iostate __err = ios_base::goodbit; __istream_type::sentry __cerb(__in, true); - if (static_cast<bool>(__cerb)) + if (__cerb) { __try { @@ -446,7 +446,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_gcount = 0; ios_base::iostate __err = ios_base::goodbit; sentry __cerb(*this, true); - if (static_cast<bool>(__cerb)) + if (__cerb) { __try { @@ -523,12 +523,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_gcount = 0; sentry __cerb(*this, true); - if (__n > 0 && static_cast<bool>(__cerb)) + if (__n > 0 && __cerb) { ios_base::iostate __err = ios_base::goodbit; __try { - const char_type __cdelim = traits_type::to_char_type(__delim); + const char_type __cdelim = traits_type::to_char_type(__delim); const int_type __eof = traits_type::eof(); __streambuf_type* __sb = this->rdbuf(); int_type __c = __sb->sgetc(); @@ -616,7 +616,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const __size_type __n = __str.max_size(); ios_base::iostate __err = ios_base::goodbit; __istream_type::sentry __cerb(__in, true); - if (static_cast<bool>(__cerb)) + if (__cerb) { __try { |