aboutsummaryrefslogtreecommitdiff
path: root/contrib/libstdc++
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/libstdc++')
-rw-r--r--contrib/libstdc++/ChangeLog31
-rw-r--r--contrib/libstdc++/std/bastring.cc10
-rw-r--r--contrib/libstdc++/std/bastring.h8
-rw-r--r--contrib/libstdc++/std/complext.cc2
-rw-r--r--contrib/libstdc++/std/valarray_array.h2
-rw-r--r--contrib/libstdc++/std/valarray_meta.h7
-rw-r--r--contrib/libstdc++/stl/ChangeLog9
-rw-r--r--contrib/libstdc++/stl/bitset3
-rw-r--r--contrib/libstdc++/tests/ChangeLog4
-rw-r--r--contrib/libstdc++/testsuite/ChangeLog4
10 files changed, 14 insertions, 66 deletions
diff --git a/contrib/libstdc++/ChangeLog b/contrib/libstdc++/ChangeLog
index 18e557aefe59..4462244e90d4 100644
--- a/contrib/libstdc++/ChangeLog
+++ b/contrib/libstdc++/ChangeLog
@@ -1,34 +1,3 @@
-Tue Mar 7 21:37:56 2000 Jeffrey A Law (law@cygnus.com)
-
- 1999-11-19 Gabriel Dos Reis <dosreis@cmla.ens-cachan.fr>
- * std/valarray_meta.h (_DEFINE_EXPR_UNARY_FUNCTION): Don't forget
- to define tanh.
-
- 1999-11-05 Gabriel Dos Reis <dosreis@cmla.ens-cachan.fr>
- * std/valarray_meta.h (_DEFINE_EXPR_UNARY_FUNCTION): When
- building meta-expressions don't forget to take the contained
- closures.
-
- 1999-10-19 Gabriel Dos Reis <dosreis@cmla.ens-cachan.fr>
- * std/valarray_meta.h: (_BinClos::_BinClos): Fix typo.
-
- 1999-09-17 Gabriel Dos Reis <dosreis@cmla.ens-cachan.fr>
- * std/complext.cc (pow): Don't expect floating point promotion
- in presence of template argument deduction. There is no such
- thing.
-
-2000-02-06 Gabriel Dos Reis <dosreis@cmla.ens-cachan.fr>
- * std/valarray_array.h (__valarray_copy): Fix typo.
-
-1999-12-14 Martin v. Löwis <loewis@informatik.hu-berlin.de>
- * std/bastring.h (basic_string::basic_string): Rename parameters
- to avoid shadow warnings.
- * std/bastring.cc (alloc): Likewise.
-
-Sun Oct 24 23:54:10 PDT 1999 Jeff Law (law@cygnus.com)
-
- * gcc-2.95.2 Released.
-
Mon Aug 16 01:29:24 PDT 1999 Jeff Law (law@cygnus.com)
* gcc-2.95.1 Released.
diff --git a/contrib/libstdc++/std/bastring.cc b/contrib/libstdc++/std/bastring.cc
index f86f6d30157c..3093b9e129d3 100644
--- a/contrib/libstdc++/std/bastring.cc
+++ b/contrib/libstdc++/std/bastring.cc
@@ -1,5 +1,5 @@
// Member templates for the -*- C++ -*- string classes.
-// Copyright (C) 1994, 1999 Free Software Foundation
+// Copyright (C) 1994 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/contrib/libstdc++/std/bastring.h b/contrib/libstdc++/std/bastring.h
index cd3793fffc04..70891262e965 100644
--- a/contrib/libstdc++/std/bastring.h
+++ b/contrib/libstdc++/std/bastring.h
@@ -1,5 +1,5 @@
// Main templates for the -*- C++ -*- string classes.
-// Copyright (C) 1994, 1995, 1999 Free Software Foundation
+// Copyright (C) 1994, 1995 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 (); }
diff --git a/contrib/libstdc++/std/complext.cc b/contrib/libstdc++/std/complext.cc
index 60227f213299..d50bf0871f61 100644
--- a/contrib/libstdc++/std/complext.cc
+++ b/contrib/libstdc++/std/complext.cc
@@ -236,7 +236,7 @@ pow (const complex<FLOAT>& xin, int y)
if (y < 0)
{
y = -y;
- x = FLOAT(1)/x;
+ x = 1/x;
}
for (;;)
{
diff --git a/contrib/libstdc++/std/valarray_array.h b/contrib/libstdc++/std/valarray_array.h
index a0b5818fd8b0..f711e52a1650 100644
--- a/contrib/libstdc++/std/valarray_array.h
+++ b/contrib/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>
diff --git a/contrib/libstdc++/std/valarray_meta.h b/contrib/libstdc++/std/valarray_meta.h
index 48fb21371f77..f799111c7bcc 100644
--- a/contrib/libstdc++/std/valarray_meta.h
+++ b/contrib/libstdc++/std/valarray_meta.h
@@ -449,7 +449,7 @@ struct _BinClos<_Oper,_ValArray,_Expr,typename _Dom::value_type,_Dom>
typedef _BinBase<_Oper,valarray<_Tp>,_Dom> _Base;
typedef typename _Base::value_type value_type;
- _BinClos (const valarray<_Tp>& __e1, const _Dom& __e2)
+ _BinClos (const valarray<_Tp> __e1, const _Dom& __e2)
: _Base (__e1, __e2) {}
};
@@ -917,7 +917,7 @@ _Name(const _Expr<_Dom,typename _Dom::value_type>& __e) \
{ \
typedef typename _Dom::value_type _Tp; \
typedef _UnFunClos<_Expr,_Dom> _Closure; \
- return _Expr<_Closure,_Tp>(_Closure(__e(), (_Tp(*)(_Tp))(&_Name))); \
+ return _Expr<_Closure,_Tp> (_Closure (__e, (_Tp(*)(_Tp))(&_Name))); \
} \
\
template<typename _Tp> \
@@ -936,8 +936,7 @@ _Name(const valarray<_Tp>& __v) \
_DEFINE_EXPR_UNARY_FUNCTION(sin)
_DEFINE_EXPR_UNARY_FUNCTION(asin)
_DEFINE_EXPR_UNARY_FUNCTION(sinh)
- _DEFINE_EXPR_UNARY_FUNCTION(tan)
- _DEFINE_EXPR_UNARY_FUNCTION(tanh)
+ _DEFINE_EXPR_UNARY_FUNCTION(tan)
_DEFINE_EXPR_UNARY_FUNCTION(atan)
_DEFINE_EXPR_UNARY_FUNCTION(exp)
_DEFINE_EXPR_UNARY_FUNCTION(log)
diff --git a/contrib/libstdc++/stl/ChangeLog b/contrib/libstdc++/stl/ChangeLog
index 785fb587e82e..22d31b0190e7 100644
--- a/contrib/libstdc++/stl/ChangeLog
+++ b/contrib/libstdc++/stl/ChangeLog
@@ -1,12 +1,3 @@
-1999-11-06 Martin v. Löwis <loewis@informatik.hu-berlin.de>
-
- * bitset (class bitset): Declare reference as our friend.
- * bitset: Include limits.h.
-
-Sun Oct 24 23:54:10 PDT 1999 Jeff Law (law@cygnus.com)
-
- * gcc-2.95.2 Released.
-
Mon Aug 16 01:29:24 PDT 1999 Jeff Law (law@cygnus.com)
* gcc-2.95.1 Released.
diff --git a/contrib/libstdc++/stl/bitset b/contrib/libstdc++/stl/bitset
index 8b4f8b1a0f80..e26845ed0455 100644
--- a/contrib/libstdc++/stl/bitset
+++ b/contrib/libstdc++/stl/bitset
@@ -36,7 +36,6 @@
#include <stddef.h> // for size_t
-#include <limits.h> // for CHAR_BIT
#include <string>
#include <stdexcept> // for invalid_argument, out_of_range, overflow_error
#include <iostream.h> // for istream, ostream
@@ -569,8 +568,6 @@ private:
public:
// bit reference:
- class reference;
- friend class reference;
class reference {
friend class bitset;
diff --git a/contrib/libstdc++/tests/ChangeLog b/contrib/libstdc++/tests/ChangeLog
index 458f08ad4849..dcec430d525b 100644
--- a/contrib/libstdc++/tests/ChangeLog
+++ b/contrib/libstdc++/tests/ChangeLog
@@ -1,7 +1,3 @@
-Sun Oct 24 23:54:10 PDT 1999 Jeff Law (law@cygnus.com)
-
- * gcc-2.95.2 Released.
-
Mon Aug 16 01:29:24 PDT 1999 Jeff Law (law@cygnus.com)
* gcc-2.95.1 Released.
diff --git a/contrib/libstdc++/testsuite/ChangeLog b/contrib/libstdc++/testsuite/ChangeLog
index 4e983e9b5ff7..784b623a6ddb 100644
--- a/contrib/libstdc++/testsuite/ChangeLog
+++ b/contrib/libstdc++/testsuite/ChangeLog
@@ -1,7 +1,3 @@
-Sun Oct 24 23:54:10 PDT 1999 Jeff Law (law@cygnus.com)
-
- * gcc-2.95.2 Released.
-
Mon Aug 16 01:29:24 PDT 1999 Jeff Law (law@cygnus.com)
* gcc-2.95.1 Released.