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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 25e079db5b5cfa0c5c0f314153b92ebc9b56b438..6b8d2b462887e3404cb5dd9f0dda6698266bfa00 100644 (file)
--- 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 f81a110c9cfbdb441c1b57f36410031aedd3d3f3..c5198041bcfadce7f254542aef96e368be6f1b3d 100644 (file)
--- 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 5731017765502331086b0db1d776e28c4e6aa18e..ba5e8470a50bc66ec783a5787da46dd8e883ac16 100644 (file)
--- 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;
     }