diff options
author | obrien <obrien@FreeBSD.org> | 2000-01-22 02:59:08 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2000-01-22 02:59:08 +0000 |
commit | 19e1413b5dc797995ed95bbd6ca6e3035103d982 (patch) | |
tree | 42c6ebe0872fe26c06d5ea952dadd4bcfa2e1fc2 /contrib/libstdc++ | |
parent | 06f3b914490df649b3b51002ca3211b12d1d0426 (diff) | |
download | FreeBSD-src-19e1413b5dc797995ed95bbd6ca6e3035103d982.zip FreeBSD-src-19e1413b5dc797995ed95bbd6ca6e3035103d982.tar.gz |
Bring in bug fixes from the GCC anoncvs server's "gcc-2_95-branch"
branch on Jan 20th, 2000.
Diffstat (limited to 'contrib/libstdc++')
-rw-r--r-- | contrib/libstdc++/ChangeLog | 6 | ||||
-rw-r--r-- | contrib/libstdc++/std/bastring.cc | 10 | ||||
-rw-r--r-- | contrib/libstdc++/std/bastring.h | 8 | ||||
-rw-r--r-- | contrib/libstdc++/stl/ChangeLog | 5 | ||||
-rw-r--r-- | contrib/libstdc++/stl/bitset | 3 |
5 files changed, 23 insertions, 9 deletions
diff --git a/contrib/libstdc++/ChangeLog b/contrib/libstdc++/ChangeLog index 462049b..fe52ab7 100644 --- a/contrib/libstdc++/ChangeLog +++ b/contrib/libstdc++/ChangeLog @@ -1,3 +1,9 @@ +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. diff --git a/contrib/libstdc++/std/bastring.cc b/contrib/libstdc++/std/bastring.cc index 3093b9e..f86f6d3 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 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/contrib/libstdc++/std/bastring.h b/contrib/libstdc++/std/bastring.h index 7089126..cd3793f 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 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 (); } diff --git a/contrib/libstdc++/stl/ChangeLog b/contrib/libstdc++/stl/ChangeLog index aa4aa15..785fb58 100644 --- a/contrib/libstdc++/stl/ChangeLog +++ b/contrib/libstdc++/stl/ChangeLog @@ -1,3 +1,8 @@ +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. diff --git a/contrib/libstdc++/stl/bitset b/contrib/libstdc++/stl/bitset index e26845e..8b4f8b1 100644 --- a/contrib/libstdc++/stl/bitset +++ b/contrib/libstdc++/stl/bitset @@ -36,6 +36,7 @@ #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 @@ -568,6 +569,8 @@ private: public: // bit reference: + class reference; + friend class reference; class reference { friend class bitset; |