diff options
author | Benjamin Kosnik <bkoz@redhat.com> | 2009-09-05 00:18:07 +0000 |
---|---|---|
committer | Benjamin Kosnik <bkoz@redhat.com> | 2009-09-05 00:18:07 +0000 |
commit | 625044797e2c4fc88e40c0822bffcaf0b099f577 (patch) | |
tree | 4dedf30fa3cf818d3f6a7e924c0cc825124ae145 /libstdc++-v3/src/compatibility.cc | |
parent | 2c93c474bb707267427873fd2ce95f498000262b (diff) |
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: https://gcc.gnu.org/svn/gcc/trunk@151445 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src/compatibility.cc')
-rw-r--r-- | libstdc++-v3/src/compatibility.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/src/compatibility.cc b/libstdc++-v3/src/compatibility.cc index 53d8e84e4f2..c81f08e070f 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 |