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

Always use prime policy for integers. Fixes trac #9282.

Browse Source
This commit is contained in:
Daniel James
2014-02-23 10:16:14 +00:00
parent 94071cc6e8
commit 57819d1dd9
3 changed files with 44 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
include/boost/unordered/detail/buckets.hpp
View File

@ -666,11 +666,51 @@ namespace boost { namespace unordered { namespace detail {
typedef mix64_policy<std::size_t> type; typedef mix64_policy<std::size_t> type;
}; };
template <typename T>
struct pick_policy : struct pick_policy :
pick_policy_impl< pick_policy_impl<
std::numeric_limits<std::size_t>::digits, std::numeric_limits<std::size_t>::digits,
std::numeric_limits<std::size_t>::radix> {}; std::numeric_limits<std::size_t>::radix> {};
// While the mix policy is generally faster, the prime policy is a lot
// faster when a large number consecutive integers are used, because
// there are no collisions. Since that is probably quite common, use
// prime policy for integeral types. But not the smaller ones, as they
// don't have enough unique values for this to be an issue.
template <>
struct pick_policy<int> {
typedef prime_policy<std::size_t> type;
};
template <>
struct pick_policy<unsigned int> {
typedef prime_policy<std::size_t> type;
};
template <>
struct pick_policy<long> {
typedef prime_policy<std::size_t> type;
};
template <>
struct pick_policy<unsigned long> {
typedef prime_policy<std::size_t> type;
};
// TODO: Maybe not if std::size_t is smaller than long long.
#if !defined(BOOST_NO_LONG_LONG)
template <>
struct pick_policy<long long> {
typedef prime_policy<std::size_t> type;
};
template <>
struct pick_policy<unsigned long long> {
typedef prime_policy<std::size_t> type;
};
#endif
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Functions // Functions

4
include/boost/unordered/detail/equivalent.hpp
View File

@ -146,7 +146,7 @@ namespace boost { namespace unordered { namespace detail {
typedef boost::unordered::detail::grouped_table_impl<types> table; typedef boost::unordered::detail::grouped_table_impl<types> table;
typedef boost::unordered::detail::set_extractor<value_type> extractor; typedef boost::unordered::detail::set_extractor<value_type> extractor;
typedef boost::unordered::detail::pick_policy::type policy; typedef boost::unordered::detail::pick_policy<T>::type policy;
}; };
template <typename A, typename K, typename M, typename H, typename P> template <typename A, typename K, typename M, typename H, typename P>
@ -171,7 +171,7 @@ namespace boost { namespace unordered { namespace detail {
typedef boost::unordered::detail::map_extractor<key_type, value_type> typedef boost::unordered::detail::map_extractor<key_type, value_type>
extractor; extractor;
typedef boost::unordered::detail::pick_policy::type policy; typedef boost::unordered::detail::pick_policy<T>::type policy;
}; };
template <typename Types> template <typename Types>

4
include/boost/unordered/detail/unique.hpp
View File

@ -139,7 +139,7 @@ namespace boost { namespace unordered { namespace detail {
typedef boost::unordered::detail::table_impl<types> table; typedef boost::unordered::detail::table_impl<types> table;
typedef boost::unordered::detail::set_extractor<value_type> extractor; typedef boost::unordered::detail::set_extractor<value_type> extractor;
typedef boost::unordered::detail::pick_policy::type policy; typedef boost::unordered::detail::pick_policy<T>::type policy;
}; };
template <typename A, typename K, typename M, typename H, typename P> template <typename A, typename K, typename M, typename H, typename P>
@ -164,7 +164,7 @@ namespace boost { namespace unordered { namespace detail {
typedef boost::unordered::detail::map_extractor<key_type, value_type> typedef boost::unordered::detail::map_extractor<key_type, value_type>
extractor; extractor;
typedef boost::unordered::detail::pick_policy::type policy; typedef boost::unordered::detail::pick_policy<T>::type policy;
}; };
template <typename Types> template <typename Types>