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

7 files changed, 51 insertions, 39 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d0562a6d89c..44da8a34504 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,15 @@
+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.
+
 2009-09-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* configure.ac: Replace AC_CONFIG_COMMANDS([default])
@@ -21,7 +33,7 @@
 2009-09-02  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/bits/stl_uninitialized.h
-	(__uninitialized_copy::uninitialized_copy): Just call (the now 
+	(__uninitialized_copy::uninitialized_copy): Just call (the now
 	forwarding) _Construct.
 
 2009-09-01  Chris Jefferson  <chris@bubblescope.net>
diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc
index 10dea7563d8..d450a4717de 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 (static_cast<bool>(__cerb))
+      if (__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 (static_cast<bool>(__cerb))
+      if (__cerb)
 	{
 	  __try
 	    {
diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index 6d1679d152f..d005f736f03 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 (static_cast<bool>(__cerb))
+	if (__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 (static_cast<bool>(__cerb))
+      if (__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 (static_cast<bool>(__cerb))
+      if (__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 (__sbout && static_cast<bool>(__cerb))
+      if (__cerb && __sbout)
 	{
 	  __try
 	    {
@@ -240,7 +240,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
 	    {
@@ -274,7 +274,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
 	    {
@@ -311,7 +311,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
 	    {
@@ -358,7 +358,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
 	    {
@@ -402,7 +402,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
             {
@@ -461,7 +461,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     {
       _M_gcount = 0;
       sentry __cerb(*this, true);
-      if (static_cast<bool>(__cerb))
+      if (__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 (__n > 0 && static_cast<bool>(__cerb))
+      if (__cerb && __n > 0)
         {
           ios_base::iostate __err = ios_base::goodbit;
           __try
@@ -556,7 +556,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     {
       _M_gcount = 0;
       sentry __cerb(*this, true);
-      if (__n > 0 && static_cast<bool>(__cerb))
+      if (__cerb && __n > 0)
         {
           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 (static_cast<bool>(__cerb))
+      if (__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 (static_cast<bool>(__cerb))
+      if (__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 (static_cast<bool>(__cerb))
+      if (__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 (static_cast<bool>(__cerb))
+      if (__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 (static_cast<bool>(__cerb))
+      if (__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 (static_cast<bool>(__cerb))
+      if (__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 (static_cast<bool>(__cerb))
+      if (__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 (static_cast<bool>(__cerb))
+      if (__cerb)
 	{
 	  __try
 	    {
diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc
index df68a57fa61..1147212aa14 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 (static_cast<bool>(__cerb))
+	if (__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 (__sbin && static_cast<bool>(__cerb))
+      if (__cerb && __sbin)
 	{
 	  __try
 	    {
@@ -155,7 +155,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       // Unformatted output functions should catch exceptions thrown
       // from streambuf members.
       sentry __cerb(*this);
-      if (static_cast<bool>(__cerb))
+      if (__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 (static_cast<bool>(__cerb))
+      if (__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 4fc52c86aff..e0017ee7cfd 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 (static_cast<bool>(__cerb))
+      if (__cerb)
 	{
 	  __try
 	    {
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
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
 	    {