diff options
| author | Levente Farkas <lfarkas@mindmaker.hu> | 2000-09-06 23:59:52 +0200 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-09-06 21:59:52 +0000 |
| commit | dbb4d33a9b95014936e8b261e40236b3244604d1 (patch) | |
| tree | a93a2a4d4a1703dc0841f63a1c9c4639bf01dd5c | |
| parent | f0bee8b3f04e7c4cecd19c90d483659a1739047f (diff) | |
| download | gcc-dbb4d33a9b95014936e8b261e40236b3244604d1.zip gcc-dbb4d33a9b95014936e8b261e40236b3244604d1.tar.gz gcc-dbb4d33a9b95014936e8b261e40236b3244604d1.tar.bz2 | |
string.tcc: Fix up more parameter names.
2000-09-06 Levente Farkas <lfarkas@mindmaker.hu>
* bits/string.tcc: Fix up more parameter names.
From-SVN: r36213
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/bits/string.tcc | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4532846..7b21a6b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2000-09-06 Levente Farkas <lfarkas@mindmaker.hu> + + * bits/string.tcc: Fix up more parameter names. + 2000-09-06 Alexandre Oliva <aoliva@redhat.com> * configure: Rebuilt with new libtool.m4. diff --git a/libstdc++-v3/bits/string.tcc b/libstdc++-v3/bits/string.tcc index c8857f6..7dd8775 100644 --- a/libstdc++-v3/bits/string.tcc +++ b/libstdc++-v3/bits/string.tcc @@ -424,10 +424,10 @@ namespace std template<typename _InputIter> basic_string<_CharT, _Traits, _Alloc>& basic_string<_CharT, _Traits, _Alloc>:: - _M_replace(iterator __i1, iterator __i2, _InputIter __j1, - _InputIter __j2, input_iterator_tag) + _M_replace(iterator __i1, iterator __i2, _InputIter __k1, + _InputIter __k2, input_iterator_tag) { - basic_string __s(__j1, __j2); + basic_string __s(__k1, __k2); return this->replace(__i1, __i2, __s._M_ibegin(), __s._M_iend()); } @@ -435,19 +435,19 @@ namespace std template<typename _ForwardIter> basic_string<_CharT, _Traits, _Alloc>& basic_string<_CharT, _Traits, _Alloc>:: - _M_replace(iterator __i1, iterator __i2, _ForwardIter __j1, - _ForwardIter __j2, forward_iterator_tag) + _M_replace(iterator __i1, iterator __i2, _ForwardIter __k1, + _ForwardIter __k2, forward_iterator_tag) { size_type __dold = __i2 - __i1; size_type __dmax = this->max_size(); - size_type __dnew = static_cast<size_type>(distance(__j1, __j2)); + size_type __dnew = static_cast<size_type>(distance(__k1, __k2)); __LENGTHERROR(__dmax <= __dnew); size_type __off = __i1 - _M_ibegin(); _M_mutate(__off, __dold, __dnew); // Invalidated __i1, __i2 if (__dnew) - _S_copy_chars(_M_data() + __off, __j1, __j2); + _S_copy_chars(_M_data() + __off, __k1, __k2); return *this; } |