4 files changed, 14 insertions, 11 deletions
diff --git a/gnu/egcs/libstdc++/std/bastring.cc b/gnu/egcs/libstdc++/std/bastring.cc
index 3093b9e129d..f86f6d30157 100644
--- a/gnu/egcs/libstdc++/std/bastring.cc
+++ b/gnu/egcs/libstdc++/std/bastring.cc
@@ -1,5 +1,5 @@
 // Member templates for the -*- C++ -*- string classes.
-// Copyright (C) 1994 Free Software Foundation
+// Copyright (C) 1994, 1999 Free Software Foundation
 
 // This file is part of the GNU ANSI C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -94,14 +94,14 @@ check_realloc (basic_string::size_type s) const
 
 template <class charT, class traits, class Allocator>
 void basic_string <charT, traits, Allocator>::
-alloc (basic_string::size_type size, bool save)
+alloc (basic_string::size_type __size, bool __save)
 {
-  if (! check_realloc (size))
+  if (! check_realloc (__size))
     return;
 
-  Rep *p = Rep::create (size);
+  Rep *p = Rep::create (__size);
 
-  if (save)
+  if (__save)
     {
       p->copy (0, data (), length ());
       p->len = length ();
diff --git a/gnu/egcs/libstdc++/std/bastring.h b/gnu/egcs/libstdc++/std/bastring.h
index 70891262e96..bbe873085ea 100644
--- a/gnu/egcs/libstdc++/std/bastring.h
+++ b/gnu/egcs/libstdc++/std/bastring.h
@@ -1,5 +1,5 @@
 // Main templates for the -*- C++ -*- string classes.
-// Copyright (C) 1994, 1995 Free Software Foundation
+// Copyright (C) 1994, 1995, 1999 Free Software Foundation
 
 // This file is part of the GNU ANSI C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -180,11 +180,11 @@ public:
     : dat (nilRep.grab ()) { assign (n, c); }
 #ifdef __STL_MEMBER_TEMPLATES
   template<class InputIterator>
-    basic_string(InputIterator begin, InputIterator end)
+    basic_string(InputIterator __begin, InputIterator __end)
 #else
-  basic_string(const_iterator begin, const_iterator end)
+  basic_string(const_iterator __begin, const_iterator __end)
 #endif
-    : dat (nilRep.grab ()) { assign (begin, end); }
+    : dat (nilRep.grab ()) { assign (__begin, __end); }
 
   ~basic_string ()
     { rep ()->release (); }
@@ -208,6 +208,9 @@ public:
 #endif
     { return replace (iend (), iend (), first, last); }
 
+  void push_back(charT __c)
+  { append(1, __c); }
+  
   basic_string& assign (const basic_string& str, size_type pos = 0,
 			size_type n = npos)
     { return replace (0, npos, str, pos, n); }
diff --git a/gnu/egcs/libstdc++/std/complext.cc b/gnu/egcs/libstdc++/std/complext.cc
index d50bf0871f6..60227f21329 100644
--- a/gnu/egcs/libstdc++/std/complext.cc
+++ b/gnu/egcs/libstdc++/std/complext.cc
@@ -236,7 +236,7 @@ pow (const complex<FLOAT>& xin, int y)
   if (y < 0)
     {
       y = -y;
-      x = 1/x;
+      x = FLOAT(1)/x;
     }
   for (;;)
     {
diff --git a/gnu/egcs/libstdc++/std/valarray_array.h b/gnu/egcs/libstdc++/std/valarray_array.h
index f711e52a165..a0b5818fd8b 100644
--- a/gnu/egcs/libstdc++/std/valarray_array.h
+++ b/gnu/egcs/libstdc++/std/valarray_array.h
@@ -73,7 +73,7 @@ template<typename _Tp>
 inline void
 __valarray_copy (const _Tp* __restrict__ __a, size_t __n, size_t __s,
                  _Tp* __restrict__ __b)
-{ for (size_t __i=0; __i<__n; ++__i, ++__b, __a += __s) *__b += *__a; }
+{ for (size_t __i=0; __i<__n; ++__i, ++__b, __a += __s) *__b = *__a; }
 
 // copy plain __a[<__n>] in strided __b[<__n : __s>]
 template<typename _Tp>