locale.cc: initialise __ret with zero

2001-03-02  Peter Schmid  <schmid@snake.iap.physik.tu-darmstadt.de>

        * src/locale.cc: initialise __ret with zero
        * src/strstream.cc:cast gptr to int_type

From-SVN: r40188
This commit is contained in:
Peter Schmid 2001-03-02 17:18:54 +00:00 committed by Benjamin Kosnik
parent 7eeb553cec
commit 758c46c9f5
3 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2001-03-02 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
* src/locale.cc: initialise __ret with zero
* src/strstream.cc:cast gptr to int_type
2001-03-01 Phil Edwards <pme@sources.redhat.com>
* docs/html/faq/index.html: Update broken links.
@ -59,7 +64,7 @@
Correct license.
* config/cpu/alpha/bits/atomicity.h: Change.
* config/cpu/arm/bits/atomicity.h
* config/cpu/arm/bits/atomicit3y.h
* config/cpu/generic/bits/atomicity.h
* config/cpu/i386/bits/atomicity.h
* config/cpu/i486/bits/atomicity.h

View File

@ -477,7 +477,7 @@ namespace std
locale::category
locale::_S_normalize_category(category __cat)
{
int __ret;
int __ret = 0;
if (__cat == none || (__cat & all) && !(__cat & ~all))
__ret = __cat;
else

View File

@ -175,7 +175,7 @@ strstreambuf::int_type strstreambuf::pbackfail(int_type c)
gbump(-1);
return _Traits::not_eof(c);
}
else if (c == (unsigned int)(gptr()[-1])) { // (u int) added KLUDGE
else if (c == static_cast<int_type>(gptr()[-1])) { // KLUDGE
gbump(-1);
return c;
}