From 4d46f7b39a9d14546ba49bcb5e8b69f64c487407 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Wed, 15 Dec 1999 07:42:12 +0000 Subject: [PATCH] bastring.h (basic_string::basic_string): Rename parameters to avoid shadow warnings. * std/bastring.h (basic_string::basic_string): Rename parameters to avoid shadow warnings. * std/bastring.cc (alloc): Likewise. From-SVN: r30939 --- libstdc++/ChangeLog | 6 ++++++ libstdc++/std/bastring.cc | 10 +++++----- libstdc++/std/bastring.h | 8 ++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog index 462049b13244..fe52ab7acf10 100644 --- a/libstdc++/ChangeLog +++ b/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/libstdc++/std/bastring.cc b/libstdc++/std/bastring.cc index 3093b9e129d3..f86f6d30157c 100644 --- a/libstdc++/std/bastring.cc +++ b/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/libstdc++/std/bastring.h b/libstdc++/std/bastring.h index 70891262e965..cd3793fffc04 100644 --- a/libstdc++/std/bastring.h +++ b/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 (); } -- 2.47.2