procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bastring.h (basic_string::basic_string): Rename parameters to avoid shadow warnings.

Browse source 
* std/bastring.h (basic_string::basic_string): Rename parameters
	to avoid shadow warnings.
	* std/bastring.cc (alloc): Likewise.

From-SVN: r30938
This commit is contained in:
Martin v. Löwis 1999-12-15 07:37:36 +00:00 • committed by Martin v. Löwis
parent fd2a10921e
commit 355e94aaeb
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libstdc++/ChangeLog
View file

@ -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.
1999-12-13 Jakub Jelinek <jakub@redhat.com>
* std/bastring.h (class basic_string::Rep): Use proper defines

10
libstdc++/std/bastring.cc
View file

@ -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 ();

12
libstdc++/std/bastring.h
View file

@ -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
@ -144,8 +144,8 @@ public:
typedef const charT* const_pointer;
typedef pointer iterator;
typedef const_pointer const_iterator;
typedef ::reverse_iterator<iterator> reverse_iterator;
typedef ::reverse_iterator<const_iterator> const_reverse_iterator;
typedef std::reverse_iterator<iterator> reverse_iterator;
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
static const size_type npos = static_cast<size_type>(-1);
private:
@ -185,11 +185,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 (); }