From 21da6d0f102f64fa2965d25c0d3d367028c5272e Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 6 Aug 2009 19:33:33 +0000 Subject: compatibility.cc: Make C++0x safe, add in explicit casts to bool for stream sentry objects. 2009-08-06 Benjamin Kosnik * 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: r150539 --- libstdc++-v3/include/bits/basic_string.tcc | 4 +-- libstdc++-v3/include/bits/istream.tcc | 40 +++++++++++++++--------------- libstdc++-v3/include/bits/ostream.tcc | 8 +++--- libstdc++-v3/include/bits/ostream_insert.h | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) (limited to 'libstdc++-v3/include/bits') diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index d450a47..10dea75 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -1007,7 +1007,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __size_type __extracted = 0; typename __ios_base::iostate __err = __ios_base::goodbit; typename __istream_type::sentry __cerb(__in, false); - if (__cerb) + if (static_cast(__cerb)) { __try { @@ -1078,7 +1078,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const __size_type __n = __str.max_size(); typename __ios_base::iostate __err = __ios_base::goodbit; typename __istream_type::sentry __cerb(__in, true); - if (__cerb) + if (static_cast(__cerb)) { __try { diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc index d005f73..6d1679d 100644 --- a/libstdc++-v3/include/bits/istream.tcc +++ b/libstdc++-v3/include/bits/istream.tcc @@ -87,7 +87,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_extract(_ValueT& __v) { sentry __cerb(*this, false); - if (__cerb) + if (static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -116,7 +116,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // _GLIBCXX_RESOLVE_LIB_DEFECTS // 118. basic_istream uses nonexistent num_get member functions. sentry __cerb(*this, false); - if (__cerb) + if (static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -161,7 +161,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // _GLIBCXX_RESOLVE_LIB_DEFECTS // 118. basic_istream uses nonexistent num_get member functions. sentry __cerb(*this, false); - if (__cerb) + if (static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -205,7 +205,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { ios_base::iostate __err = ios_base::goodbit; sentry __cerb(*this, false); - if (__cerb && __sbout) + if (__sbout && static_cast(__cerb)) { __try { @@ -240,7 +240,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_gcount = 0; ios_base::iostate __err = ios_base::goodbit; sentry __cerb(*this, true); - if (__cerb) + if (static_cast(__cerb)) { __try { @@ -274,7 +274,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_gcount = 0; ios_base::iostate __err = ios_base::goodbit; sentry __cerb(*this, true); - if (__cerb) + if (static_cast(__cerb)) { __try { @@ -311,7 +311,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_gcount = 0; ios_base::iostate __err = ios_base::goodbit; sentry __cerb(*this, true); - if (__cerb) + if (static_cast(__cerb)) { __try { @@ -358,7 +358,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_gcount = 0; ios_base::iostate __err = ios_base::goodbit; sentry __cerb(*this, true); - if (__cerb) + if (static_cast(__cerb)) { __try { @@ -402,7 +402,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_gcount = 0; ios_base::iostate __err = ios_base::goodbit; sentry __cerb(*this, true); - if (__cerb) + if (static_cast(__cerb)) { __try { @@ -461,7 +461,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { _M_gcount = 0; sentry __cerb(*this, true); - if (__cerb) + if (static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -494,7 +494,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { _M_gcount = 0; sentry __cerb(*this, true); - if (__cerb && __n > 0) + if (__n > 0 && static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -556,7 +556,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { _M_gcount = 0; sentry __cerb(*this, true); - if (__cerb && __n > 0) + if (__n > 0 && static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -622,7 +622,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) int_type __c = traits_type::eof(); _M_gcount = 0; sentry __cerb(*this, true); - if (__cerb) + if (static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -651,7 +651,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { _M_gcount = 0; sentry __cerb(*this, true); - if (__cerb) + if (static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -680,7 +680,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { _M_gcount = 0; sentry __cerb(*this, true); - if (__cerb) + if (static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -714,7 +714,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // 60. What is a formatted input function? _M_gcount = 0; sentry __cerb(*this, true); - if (__cerb) + if (static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -747,7 +747,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // 60. What is a formatted input function? _M_gcount = 0; sentry __cerb(*this, true); - if (__cerb) + if (static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -780,7 +780,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // DR60. Do not change _M_gcount. int __ret = -1; sentry __cerb(*this, true); - if (__cerb) + if (static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -906,7 +906,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) typedef typename __istream_type::int_type __int_type; typename __istream_type::sentry __cerb(__in, false); - if (__cerb) + if (static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -943,7 +943,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) streamsize __extracted = 0; ios_base::iostate __err = ios_base::goodbit; typename __istream_type::sentry __cerb(__in, false); - if (__cerb) + if (static_cast(__cerb)) { __try { diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc index 1147212..df68a57 100644 --- a/libstdc++-v3/include/bits/ostream.tcc +++ b/libstdc++-v3/include/bits/ostream.tcc @@ -64,7 +64,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _M_insert(_ValueT __v) { sentry __cerb(*this); - if (__cerb) + if (static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -121,7 +121,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { ios_base::iostate __err = ios_base::goodbit; sentry __cerb(*this); - if (__cerb && __sbin) + if (__sbin && static_cast(__cerb)) { __try { @@ -155,7 +155,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // Unformatted output functions should catch exceptions thrown // from streambuf members. sentry __cerb(*this); - if (__cerb) + if (static_cast(__cerb)) { ios_base::iostate __err = ios_base::goodbit; __try @@ -190,7 +190,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // Unformatted output functions should catch exceptions thrown // from streambuf members. sentry __cerb(*this); - if (__cerb) + if (static_cast(__cerb)) { __try { _M_write(__s, __n); } diff --git a/libstdc++-v3/include/bits/ostream_insert.h b/libstdc++-v3/include/bits/ostream_insert.h index e0017ee..4fc52c8 100644 --- a/libstdc++-v3/include/bits/ostream_insert.h +++ b/libstdc++-v3/include/bits/ostream_insert.h @@ -78,7 +78,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) typedef typename __ostream_type::ios_base __ios_base; typename __ostream_type::sentry __cerb(__out); - if (__cerb) + if (static_cast(__cerb)) { __try { -- cgit v1.1