diff options
| author | Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de> | 2001-03-02 17:18:54 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2001-03-02 17:18:54 +0000 |
| commit | 758c46c9f55cab48262a3467f8d2094911d6af5e (patch) | |
| tree | c8c011849590a03ca017e994689a196fb77fc4dd | |
| parent | 7eeb553cec1598b3cd5307f8be190af8bf155651 (diff) | |
| download | gcc-758c46c9f55cab48262a3467f8d2094911d6af5e.zip gcc-758c46c9f55cab48262a3467f8d2094911d6af5e.tar.gz gcc-758c46c9f55cab48262a3467f8d2094911d6af5e.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/src/locale.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/src/strstream.cc | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 25e079d..6b8d2b4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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 diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc index f81a110..c519804 100644 --- a/libstdc++-v3/src/locale.cc +++ b/libstdc++-v3/src/locale.cc @@ -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 diff --git a/libstdc++-v3/src/strstream.cc b/libstdc++-v3/src/strstream.cc index 5731017..ba5e847 100644 --- a/libstdc++-v3/src/strstream.cc +++ b/libstdc++-v3/src/strstream.cc @@ -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; } |