Mercurial > hg > CbC > CbC_gcc
diff libstdc++-v3/include/tr1/hashtable_policy.h @ 155:da32f4b04d38
fix __code name conflict
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Mon, 25 May 2020 17:51:46 +0900 |
| parents | 1830386684a0 |
| children |
line wrap: on
line diff
--- a/libstdc++-v3/include/tr1/hashtable_policy.h Sat May 23 14:59:38 2020 +0900 +++ b/libstdc++-v3/include/tr1/hashtable_policy.h Mon May 25 17:51:46 2020 +0900 @@ -515,15 +515,15 @@ operator[](const _Key& __k) { _Hashtable* __h = static_cast<_Hashtable*>(this); - typename _Hashtable::_Hash_code_type __code = __h->_M_hash_code(__k); - std::size_t __n = __h->_M_bucket_index(__k, __code, + typename _Hashtable::_Hash_code_type __code0 = __h->_M_hash_code(__k); + std::size_t __n = __h->_M_bucket_index(__k, __code0, __h->_M_bucket_count); typename _Hashtable::_Node* __p = - __h->_M_find_node(__h->_M_buckets[__n], __k, __code); + __h->_M_find_node(__h->_M_buckets[__n], __k, __code0); if (!__p) return __h->_M_insert_bucket(std::make_pair(__k, mapped_type()), - __n, __code)->second; + __n, __code0)->second; return (__p->_M_v).second; }