diff options
| author | Martin v. Löwis <loewis@informatik.hu-berlin.de> | 1999-12-15 07:37:36 +0000 |
|---|---|---|
| committer | Martin v. Löwis <loewis@gcc.gnu.org> | 1999-12-15 07:37:36 +0000 |
| commit | 355e94aaeb469d9012bd71ef7cbd9654a9e58169 (patch) | |
| tree | deb0a026b4ee27784c6c0790db5f9f42d08b2362 | |
| parent | fd2a10921e97cbdb7e39311eabe38f5213e46b85 (diff) | |
| download | gcc-355e94aaeb469d9012bd71ef7cbd9654a9e58169.zip gcc-355e94aaeb469d9012bd71ef7cbd9654a9e58169.tar.gz gcc-355e94aaeb469d9012bd71ef7cbd9654a9e58169.tar.bz2 | |
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: r30938
| -rw-r--r-- | libstdc++/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++/std/bastring.cc | 10 | ||||
| -rw-r--r-- | libstdc++/std/bastring.h | 12 |
3 files changed, 17 insertions, 11 deletions
diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog index 8321865..d51fb29 100644 --- a/libstdc++/ChangeLog +++ b/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. + 1999-12-13 Jakub Jelinek <jakub@redhat.com> * std/bastring.h (class basic_string::Rep): Use proper defines diff --git a/libstdc++/std/bastring.cc b/libstdc++/std/bastring.cc index 3093b9e1..f86f6d3 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 <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/libstdc++/std/bastring.h b/libstdc++/std/bastring.h index 7f0b1bf..bfa80bf 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 @@ -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 (); } |