From cbab3205286065bef3f77788d973d62378b6d6f0 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sat, 22 Jan 2000 02:59:08 +0000 Subject: Bring in bug fixes from the GCC anoncvs server's "gcc-2_95-branch" branch on Jan 20th, 2000. --- contrib/libstdc++/ChangeLog | 6 ++++++ contrib/libstdc++/std/bastring.cc | 10 +++++----- contrib/libstdc++/std/bastring.h | 8 ++++---- contrib/libstdc++/stl/ChangeLog | 5 +++++ contrib/libstdc++/stl/bitset | 3 +++ 5 files changed, 23 insertions(+), 9 deletions(-) (limited to 'contrib/libstdc++') diff --git a/contrib/libstdc++/ChangeLog b/contrib/libstdc++/ChangeLog index 462049b13244..fe52ab7acf10 100644 --- a/contrib/libstdc++/ChangeLog +++ b/contrib/libstdc++/ChangeLog @@ -1,3 +1,9 @@ +1999-12-14 Martin v. Löwis + + * 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 3093b9e129d3..f86f6d30157c 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 void basic_string :: -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 70891262e965..cd3793fffc04 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 - 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 aa4aa155d7e9..785fb587e82e 100644 --- a/contrib/libstdc++/stl/ChangeLog +++ b/contrib/libstdc++/stl/ChangeLog @@ -1,3 +1,8 @@ +1999-11-06 Martin v. Löwis + + * 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 e26845ed0455..8b4f8b1a0f80 100644 --- a/contrib/libstdc++/stl/bitset +++ b/contrib/libstdc++/stl/bitset @@ -36,6 +36,7 @@ #include // for size_t +#include // for CHAR_BIT #include #include // for invalid_argument, out_of_range, overflow_error #include // for istream, ostream @@ -568,6 +569,8 @@ private: public: // bit reference: + class reference; + friend class reference; class reference { friend class bitset; -- cgit v1.3