istream.tcc (basic_istream::read, [...]): Avoid redundant setstate(failbit) calls...

2003-09-22  Petur Runolfsson  <peturr02@ru.is>

	* include/bits/istream.tcc (basic_istream::read,
	basic_istream::readsome, basic_istream::putback,
	basic_istream::unget, operator>>(basic_istream, CharT)):
	Avoid redundant setstate(failbit) calls when sentry::operator bool()
	returns false.

From-SVN: r71662

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 959e136f30d1f84e51ca260da843d61cce6668c2..9caf65ac7e18924caf8c719d51fc97a71659d9e4 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-22  Petur Runolfsson  <peturr02@ru.is>
+
+       * include/bits/istream.tcc (basic_istream::read,
+       basic_istream::readsome, basic_istream::putback,
+       basic_istream::unget, operator>>(basic_istream, CharT)):
+       Avoid redundant setstate(failbit) calls when sentry::operator bool()
+       returns false.
+
 2003-09-22  Carlo Wood  <carlo@alinoe.com>
 
        PR libstdc++/12365

diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index 543d94d0f1d3546cb32ac3dd6459316fb869f124..e6677c523a4bfc2314aa79e1264052840cd22649 100644 (file)
--- a/libstdc++-v3/include/bits/istream.tcc
+++ b/libstdc++-v3/include/bits/istream.tcc
@@ -798,8 +798,6 @@ namespace std
                __throw_exception_again;
            }
        }
-      else
-       this->setstate(ios_base::failbit);
       return *this;
     }
   
@@ -834,8 +832,6 @@ namespace std
                __throw_exception_again;
            }
        }
-      else
-       this->setstate(ios_base::failbit);
       return _M_gcount;
     }
       
@@ -868,8 +864,6 @@ namespace std
                __throw_exception_again;
            }
        }
-      else
-       this->setstate(ios_base::failbit);
       return *this;
     }
   
@@ -902,8 +896,6 @@ namespace std
                __throw_exception_again;
            }
        }
-      else
-       this->setstate(ios_base::failbit);
       return *this;
     }
   
@@ -1014,8 +1006,6 @@ namespace std
                __throw_exception_again;
            }
        }
-      else
-       __in.setstate(ios_base::failbit);
       return __in;
     }