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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 73ea5e5e32c90a278c431754bf406c714b465c04..de9e83051835c311721c9e8e49759ccca35897b6 100644 (file)
--- 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 9bd69cd853a4b0b0b214d85b485314ef8cf133e1..ab5cf5203b1c26ad0471cdea2d1a1710f4b48899 100644 (file)
--- 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;
         }
       }
     }