re PR libstdc++/13831 (Unused variable in basic_filebuf::underflow)

2004-01-23  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/13831
	* include/bits/fstream.tcc (underflow): Remove unused
	variable.
	* include/bits/streambuf_iterator.h (equal): Ditto.
	* include/bits/locale_facets.h (_M_convert_from_char):
	Ditto.

From-SVN: r76433

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a2e6307aec110d0388d1828abb0563d8768db544..7ef928c02491f958ba1c1d0455a9ae7a90ebff67 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-23  Paolo Carlini  <pcarlini@suse.de>
+
+       PR libstdc++/13831
+       * include/bits/fstream.tcc (underflow): Remove unused
+       variable.
+       * include/bits/streambuf_iterator.h (equal): Ditto.
+       * include/bits/locale_facets.h (_M_convert_from_char):
+       Ditto.
+
 2004-01-23  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        PR c/13814

diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc
index ed2fb6aace9756554573497115946e3936c6cd97..de6379b886348174b957cf1b0d60c225919832c6 100644 (file)
--- a/libstdc++-v3/include/bits/fstream.tcc
+++ b/libstdc++-v3/include/bits/fstream.tcc
@@ -179,7 +179,6 @@ namespace std
     {
       int_type __ret = traits_type::eof();
       const bool __testin = this->_M_mode & ios_base::in;
-      const bool __testout = this->_M_mode & ios_base::out;
       if (__testin && !_M_writing)
        {
          // Check for pback madness, and if so swich back to the

diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
index 05003ed28d5826d70dddce45a3c5cd7a2cd2a33a..6f212fe08ae8486d79bac7bad6a0f205dbe6d8ed 100644 (file)
--- a/libstdc++-v3/include/bits/locale_facets.h
+++ b/libstdc++-v3/include/bits/locale_facets.h
@@ -4384,14 +4384,15 @@ namespace std
 
       // Returns a locale and codeset-converted string, given a char* message.
       string_type
-      _M_convert_from_char(char* __msg) const
+      _M_convert_from_char(char*) const
       {
+#if 0
        // Length of message string without terminating null.
        size_t __len = char_traits<char>::length(__msg) - 1;
 
        // "everybody can easily convert the string using
        // mbsrtowcs/wcsrtombs or with iconv()"
-#if 0
+
        // Convert char* to _CharT in locale used to open catalog.
        // XXX need additional template parameter on messages class for this..
        // typedef typename codecvt<char, _CharT, _StateT> __codecvt_type;

diff --git a/libstdc++-v3/include/bits/streambuf_iterator.h b/libstdc++-v3/include/bits/streambuf_iterator.h
index 3c393e3f955c3a22665e646a5e3b6a94a05f382e..027cc891d9998bebabdcfeaf7cf43eeff3a6323a 100644 (file)
--- a/libstdc++-v3/include/bits/streambuf_iterator.h
+++ b/libstdc++-v3/include/bits/streambuf_iterator.h
@@ -132,9 +132,8 @@ namespace std
       bool 
       equal(const istreambuf_iterator& __b) const
       {
-       const int_type __eof = traits_type::eof();
-       bool __thiseof = _M_at_eof();
-       bool __beof = __b._M_at_eof();
+       const bool __thiseof = _M_at_eof();
+       const bool __beof = __b._M_at_eof();
        return (__thiseof && __beof || (!__thiseof && !__beof));
       }