istream.tcc (basic_istream<>::sentry:: sentry(basic_istream<>&, bool)): Explicitely...

2007-11-15  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/istream.tcc (basic_istream<>::sentry::
	sentry(basic_istream<>&, bool)): Explicitely convert to bool.
	* include/bits/locale_facets.tcc (num_put<>::_M_insert_int(_OutIter,
	ios_base&, _CharT, _ValueT)): Likewise.
	* include/std/ostream (basic_ostream<>::sentry::~sentry): Likewise.

From-SVN: r130211

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3165b3ea651f171ec60fdb1c8dd0163cab2beb20..c4058b2c239f607e400847c7a659fa5d23aef747 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-15  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/bits/istream.tcc (basic_istream<>::sentry::
+       sentry(basic_istream<>&, bool)): Explicitely convert to bool.
+       * include/bits/locale_facets.tcc (num_put<>::_M_insert_int(_OutIter,
+       ios_base&, _CharT, _ValueT)): Likewise.
+       * include/std/ostream (basic_ostream<>::sentry::~sentry): Likewise.
+
 2007-11-15  Paolo Carlini  <pcarlini@suse.de>
 
        PR libstdc++/34105

diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index 2e65b4847b96111fe5974db537c7036fff3a70cd..440d234023e74bf2bdfd1cfff781ffa69b994eb1 100644 (file)
--- a/libstdc++-v3/include/bits/istream.tcc
+++ b/libstdc++-v3/include/bits/istream.tcc
@@ -56,7 +56,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
        {
          if (__in.tie())
            __in.tie()->flush();
-         if (!__noskip && (__in.flags() & ios_base::skipws))
+         if (!__noskip && bool(__in.flags() & ios_base::skipws))
            {
              const __int_type __eof = traits_type::eof();
              __streambuf_type* __sb = __in.rdbuf();

diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index 1b714adf8fe9cf8d0267ddc0d92b92f906ae0a42..000d6fb9d628a9b0c95497040fb37780691946d5 100644 (file)
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -876,14 +876,14 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
            // Decimal.
            if (__v > 0)
              {
-               if (__flags & ios_base::showpos
+               if (bool(__flags & ios_base::showpos)
                    && __gnu_cxx::__numeric_traits<_ValueT>::__is_signed)
                  *--__cs = __lit[__num_base::_S_oplus], ++__len;
              }
            else if (__v)
              *--__cs = __lit[__num_base::_S_ominus], ++__len;
          }
-       else if (__flags & ios_base::showbase && __v)
+       else if (bool(__flags & ios_base::showbase) && __v)
          {
            if (__basefield == ios_base::oct)
              *--__cs = __lit[__num_base::_S_odigits], ++__len;

diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream
index 4fb6d19b7fcc2008beaa3feeb1bda1d5e66ce7d8..db9c91160604327af3b8688445f30f21aed57388 100644 (file)
--- a/libstdc++-v3/include/std/ostream
+++ b/libstdc++-v3/include/std/ostream
@@ -416,7 +416,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       ~sentry()
       {
        // XXX MT
-       if (_M_os.flags() & ios_base::unitbuf && !uncaught_exception())
+       if (bool(_M_os.flags() & ios_base::unitbuf) && !uncaught_exception())
          {
            // Can't call flush directly or else will get into recursive lock.
            if (_M_os.rdbuf() && _M_os.rdbuf()->pubsync() == -1)