Mercurial > hg > CbC > CbC_gcc
diff libstdc++-v3/include/bits/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/bits/hashtable_policy.h Sat May 23 14:59:38 2020 +0900 +++ b/libstdc++-v3/include/bits/hashtable_policy.h Mon May 25 17:51:46 2020 +0900 @@ -705,9 +705,9 @@ -> mapped_type& { __hashtable* __h = static_cast<__hashtable*>(this); - __hash_code __code = __h->_M_hash_code(__k); - std::size_t __bkt = __h->_M_bucket_index(__k, __code); - if (__node_type* __node = __h->_M_find_node(__bkt, __k, __code)) + __hash_code __code0 = __h->_M_hash_code(__k); + std::size_t __bkt = __h->_M_bucket_index(__k, __code0); + if (__node_type* __node = __h->_M_find_node(__bkt, __k, __code0)) return __node->_M_v().second; typename __hashtable::_Scoped_node __node { @@ -717,7 +717,7 @@ std::tuple<>() }; auto __pos - = __h->_M_insert_unique_node(__k, __bkt, __code, __node._M_node); + = __h->_M_insert_unique_node(__k, __bkt, __code0, __node._M_node); __node._M_node = nullptr; return __pos->second; } @@ -732,9 +732,9 @@ -> mapped_type& { __hashtable* __h = static_cast<__hashtable*>(this); - __hash_code __code = __h->_M_hash_code(__k); - std::size_t __bkt = __h->_M_bucket_index(__k, __code); - if (__node_type* __node = __h->_M_find_node(__bkt, __k, __code)) + __hash_code __code0 = __h->_M_hash_code(__k); + std::size_t __bkt = __h->_M_bucket_index(__k, __code0); + if (__node_type* __node = __h->_M_find_node(__bkt, __k, __code0)) return __node->_M_v().second; typename __hashtable::_Scoped_node __node { @@ -744,7 +744,7 @@ std::tuple<>() }; auto __pos - = __h->_M_insert_unique_node(__k, __bkt, __code, __node._M_node); + = __h->_M_insert_unique_node(__k, __bkt, __code0, __node._M_node); __node._M_node = nullptr; return __pos->second; } @@ -759,9 +759,9 @@ -> mapped_type& { __hashtable* __h = static_cast<__hashtable*>(this); - __hash_code __code = __h->_M_hash_code(__k); - std::size_t __bkt = __h->_M_bucket_index(__k, __code); - __node_type* __p = __h->_M_find_node(__bkt, __k, __code); + __hash_code __code0 = __h->_M_hash_code(__k); + std::size_t __bkt = __h->_M_bucket_index(__k, __code0); + __node_type* __p = __h->_M_find_node(__bkt, __k, __code0); if (!__p) __throw_out_of_range(__N("_Map_base::at")); @@ -778,9 +778,9 @@ -> const mapped_type& { const __hashtable* __h = static_cast<const __hashtable*>(this); - __hash_code __code = __h->_M_hash_code(__k); - std::size_t __bkt = __h->_M_bucket_index(__k, __code); - __node_type* __p = __h->_M_find_node(__bkt, __k, __code); + __hash_code __code0 = __h->_M_hash_code(__k); + std::size_t __bkt = __h->_M_bucket_index(__k, __code0); + __node_type* __p = __h->_M_find_node(__bkt, __k, __code0); if (!__p) __throw_out_of_range(__N("_Map_base::at"));