git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Paolo Carlini 2004-01-23 16:51:24 +00:00 committed by Paolo Carlini
parent 129057c1ee
commit 22352844c9
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -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> 2004-01-23 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
PR c/13814 PR c/13814

1
libstdc++-v3/include/bits/fstream.tcc
View File

@ -179,7 +179,6 @@ namespace std
{ {
int_type __ret = traits_type::eof(); int_type __ret = traits_type::eof();
const bool __testin = this->_M_mode & ios_base::in; const bool __testin = this->_M_mode & ios_base::in;
const bool __testout = this->_M_mode & ios_base::out;
if (__testin && !_M_writing) if (__testin && !_M_writing)
{ {
// Check for pback madness, and if so swich back to the // Check for pback madness, and if so swich back to the

5
libstdc++-v3/include/bits/locale_facets.h
View File

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

5
libstdc++-v3/include/bits/streambuf_iterator.h
View File

@ -132,9 +132,8 @@ namespace std
bool bool
equal(const istreambuf_iterator& __b) const equal(const istreambuf_iterator& __b) const
{ {
const int_type __eof = traits_type::eof(); const bool __thiseof = _M_at_eof();
bool __thiseof = _M_at_eof(); const bool __beof = __b._M_at_eof();
bool __beof = __b._M_at_eof();
return (__thiseof && __beof || (!__thiseof && !__beof)); return (__thiseof && __beof || (!__thiseof && !__beof));
} }