diff options
| author | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2009-09-05 00:18:07 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2009-09-05 00:18:07 +0000 |
| commit | 880b527fd8f5cab04d060212d2c3ac5da7055b3d (patch) | |
| tree | 4dedf30fa3cf818d3f6a7e924c0cc825124ae145 /libstdc++-v3/src | |
| parent | e8fc61f7533662237f981e218aad04c77d7e0c80 (diff) | |
| download | gcc-880b527fd8f5cab04d060212d2c3ac5da7055b3d.zip gcc-880b527fd8f5cab04d060212d2c3ac5da7055b3d.tar.gz gcc-880b527fd8f5cab04d060212d2c3ac5da7055b3d.tar.bz2 | |
revert: compatibility.cc: Make C++0x safe, add in explicit casts to bool for stream sentry objects.
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.
From-SVN: r151445
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/compatibility.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/istream.cc | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libstdc++-v3/src/compatibility.cc b/libstdc++-v3/src/compatibility.cc index 53d8e84..c81f08e 100644 --- a/libstdc++-v3/src/compatibility.cc +++ b/libstdc++-v3/src/compatibility.cc @@ -62,7 +62,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 @@ -134,7 +134,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 diff --git a/libstdc++-v3/src/istream.cc b/libstdc++-v3/src/istream.cc index 0e7cbfb..e410277 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 { |