feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Revert perfect forwarding when hashing for transparent ops

Browse Source
This commit is contained in:
Christian Mazakas
2023-01-10 12:35:59 -08:00
parent eb6d0d1f66
commit d9bf1e435c
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/boost/unordered/detail/foa.hpp
View File

@ -38,10 +38,6 @@
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include <iostream>
template <class> struct X;
#if defined(__SSE2__)||\ #if defined(__SSE2__)||\
defined(_M_X64)||(defined(_M_IX86_FP)&&_M_IX86_FP>=2) defined(_M_X64)||(defined(_M_IX86_FP)&&_M_IX86_FP>=2)
#define BOOST_UNORDERED_SSE2 #define BOOST_UNORDERED_SSE2
@ -741,18 +737,18 @@ private:
struct no_mix struct no_mix
{ {
template<typename Hash,typename T> template<typename Hash,typename T>
static inline std::size_t mix(const Hash& h,T&& x) static inline std::size_t mix(const Hash& h,const T& x)
{ {
return h(std::forward<T>(x)); return h(x);
} }
}; };
struct xmx_mix struct xmx_mix
{ {
template<typename Hash,typename T> template<typename Hash,typename T>
static inline std::size_t mix(const Hash& h,T&& x) static inline std::size_t mix(const Hash& h,const T& x)
{ {
return xmx(h(std::forward<T>(x))); return xmx(h(x));
} }
}; };
@ -1752,16 +1748,16 @@ private:
} }
template<typename Key,typename... Args> template<typename Key,typename... Args>
static inline Key&& key_from( static inline const Key& key_from(
try_emplace_args_t,Key&& x,const Args&...) try_emplace_args_t,const Key& x,const Args&...)
{ {
return std::forward<Key>(x); return x;
} }
template<typename Key> template<typename Key>
inline std::size_t hash_for(Key&& x)const inline std::size_t hash_for(const Key& x)const
{ {
return mix_policy::mix(h(),std::forward<Key>(x)); return mix_policy::mix(h(),x);
} }
inline std::size_t position_for(std::size_t hash)const inline std::size_t position_for(std::size_t hash)const
@ -1839,10 +1835,10 @@ private:
template<typename... Args> template<typename... Args>
BOOST_FORCEINLINE std::pair<iterator,bool> emplace_impl(Args&&... args) BOOST_FORCEINLINE std::pair<iterator,bool> emplace_impl(Args&&... args)
{ {
auto &&k=key_from(std::forward<Args>(args)...); const auto &k=key_from(std::forward<Args>(args)...);
auto hash=hash_for(std::forward<decltype(k)>(k)); auto hash=hash_for(k);
auto pos0=position_for(hash); auto pos0=position_for(hash);
auto it=find_impl(k,pos0,hash); auto it=find_impl(k,pos0,hash);
if(it!=end()){ if(it!=end()){
return {it,false}; return {it,false};