diff options
| author | Levente Farkas <lfarkas@mindmaker.hu> | 2000-09-25 17:33:35 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-09-25 17:33:35 +0000 |
| commit | be54495730aff9630aca762dd7f03c5b897cc787 (patch) | |
| tree | 6fa17e537a0e44934bc66c87dba21dbf158d0919 | |
| parent | 0e00b68b77f4cc89684ed1b2364c71d175676acf (diff) | |
| download | gcc-be54495730aff9630aca762dd7f03c5b897cc787.zip gcc-be54495730aff9630aca762dd7f03c5b897cc787.tar.gz gcc-be54495730aff9630aca762dd7f03c5b897cc787.tar.bz2 | |
stl_hashtable.h (_M_copy_from): Change __copy to __local_copy.
2000-09-25 Levente Farkas <lfarkas@mindmaker.hu>
* ext/stl_hashtable.h (_M_copy_from): Change __copy to __local_copy.
From-SVN: r36624
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/ext/stl_hashtable.h | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 73ea5e5..de9e830 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,8 +1,12 @@ +2000-09-25 Levente Farkas <lfarkas@mindmaker.hu> + + * ext/stl_hashtable.h (_M_copy_from): Change __copy to __local_copy. + 2000-09-19 Benjamin Kosnik <bkoz@purist.soma.redhat.com> * src/localename.cc (locale::_Imp) : Remove typedefs. * bits/localefwd.h (locale::locale(const locale& __other, _Facet* - __f): Consistency check,, call _Imp ctor with refererence argument + __f): Consistency check, call _Imp ctor with reference argument of 1. * bits/localefwd.h: Change _S_num_categories to _S_categories_num. Add new data member, _S_facets_num, which is diff --git a/libstdc++-v3/ext/stl_hashtable.h b/libstdc++-v3/ext/stl_hashtable.h index 9bd69cd..ab5cf52 100644 --- a/libstdc++-v3/ext/stl_hashtable.h +++ b/libstdc++-v3/ext/stl_hashtable.h @@ -1029,14 +1029,14 @@ void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All> for (size_type __i = 0; __i < __ht._M_buckets.size(); ++__i) { const _Node* __cur = __ht._M_buckets[__i]; if (__cur) { - _Node* __copy = _M_new_node(__cur->_M_val); - _M_buckets[__i] = __copy; + _Node* __local_copy = _M_new_node(__cur->_M_val); + _M_buckets[__i] = __local_copy; for (_Node* __next = __cur->_M_next; __next; __cur = __next, __next = __cur->_M_next) { - __copy->_M_next = _M_new_node(__next->_M_val); - __copy = __copy->_M_next; + __local_copy->_M_next = _M_new_node(__next->_M_val); + __local_copy = __local_copy->_M_next; } } } |