From 57819d1dd98d23f2a59f59bdb752420b5ae11d52 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sun, 23 Feb 2014 10:16:14 +0000 Subject: [PATCH 1/7] Always use prime policy for integers. Fixes trac #9282. --- include/boost/unordered/detail/buckets.hpp | 40 +++++++++++++++++++ include/boost/unordered/detail/equivalent.hpp | 4 +- include/boost/unordered/detail/unique.hpp | 4 +- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/include/boost/unordered/detail/buckets.hpp b/include/boost/unordered/detail/buckets.hpp index 38c32f5a..6ad3808b 100644 --- a/include/boost/unordered/detail/buckets.hpp +++ b/include/boost/unordered/detail/buckets.hpp @@ -666,11 +666,51 @@ namespace boost { namespace unordered { namespace detail { typedef mix64_policy type; }; + template struct pick_policy : pick_policy_impl< std::numeric_limits::digits, std::numeric_limits::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 { + typedef prime_policy type; + }; + + template <> + struct pick_policy { + typedef prime_policy type; + }; + + template <> + struct pick_policy { + typedef prime_policy type; + }; + + template <> + struct pick_policy { + typedef prime_policy type; + }; + + // TODO: Maybe not if std::size_t is smaller than long long. +#if !defined(BOOST_NO_LONG_LONG) + template <> + struct pick_policy { + typedef prime_policy type; + }; + + template <> + struct pick_policy { + typedef prime_policy type; + }; +#endif + //////////////////////////////////////////////////////////////////////////// // Functions diff --git a/include/boost/unordered/detail/equivalent.hpp b/include/boost/unordered/detail/equivalent.hpp index ab175313..5b6cdfa6 100644 --- a/include/boost/unordered/detail/equivalent.hpp +++ b/include/boost/unordered/detail/equivalent.hpp @@ -146,7 +146,7 @@ namespace boost { namespace unordered { namespace detail { typedef boost::unordered::detail::grouped_table_impl table; typedef boost::unordered::detail::set_extractor extractor; - typedef boost::unordered::detail::pick_policy::type policy; + typedef boost::unordered::detail::pick_policy::type policy; }; template @@ -171,7 +171,7 @@ namespace boost { namespace unordered { namespace detail { typedef boost::unordered::detail::map_extractor extractor; - typedef boost::unordered::detail::pick_policy::type policy; + typedef boost::unordered::detail::pick_policy::type policy; }; template diff --git a/include/boost/unordered/detail/unique.hpp b/include/boost/unordered/detail/unique.hpp index 88bbf0b6..67416a19 100644 --- a/include/boost/unordered/detail/unique.hpp +++ b/include/boost/unordered/detail/unique.hpp @@ -139,7 +139,7 @@ namespace boost { namespace unordered { namespace detail { typedef boost::unordered::detail::table_impl table; typedef boost::unordered::detail::set_extractor extractor; - typedef boost::unordered::detail::pick_policy::type policy; + typedef boost::unordered::detail::pick_policy::type policy; }; template @@ -164,7 +164,7 @@ namespace boost { namespace unordered { namespace detail { typedef boost::unordered::detail::map_extractor extractor; - typedef boost::unordered::detail::pick_policy::type policy; + typedef boost::unordered::detail::pick_policy::type policy; }; template From 06b6418044f071901ecc0ed6b3d0e5db02c5198a Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sun, 23 Feb 2014 14:30:21 +0000 Subject: [PATCH 2/7] Add metadata --- meta/libraries.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 meta/libraries.xml diff --git a/meta/libraries.xml b/meta/libraries.xml new file mode 100644 index 00000000..39b4fdeb --- /dev/null +++ b/meta/libraries.xml @@ -0,0 +1,13 @@ + + + + unordered + 1.36.0 + Unordered + Daniel James + Unordered associative containers. + false + true + Containers + + From 99fdce0b4d4c355dc10f845a469f1a3e21cde18c Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 24 Feb 2014 16:54:12 +0000 Subject: [PATCH 3/7] Fix policy typedefs. --- include/boost/unordered/detail/equivalent.hpp | 4 ++-- include/boost/unordered/detail/unique.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/unordered/detail/equivalent.hpp b/include/boost/unordered/detail/equivalent.hpp index 5b6cdfa6..d5538d73 100644 --- a/include/boost/unordered/detail/equivalent.hpp +++ b/include/boost/unordered/detail/equivalent.hpp @@ -146,7 +146,7 @@ namespace boost { namespace unordered { namespace detail { typedef boost::unordered::detail::grouped_table_impl table; typedef boost::unordered::detail::set_extractor extractor; - typedef boost::unordered::detail::pick_policy::type policy; + typedef typename boost::unordered::detail::pick_policy::type policy; }; template @@ -171,7 +171,7 @@ namespace boost { namespace unordered { namespace detail { typedef boost::unordered::detail::map_extractor extractor; - typedef boost::unordered::detail::pick_policy::type policy; + typedef typename boost::unordered::detail::pick_policy::type policy; }; template diff --git a/include/boost/unordered/detail/unique.hpp b/include/boost/unordered/detail/unique.hpp index 67416a19..5fd5a46d 100644 --- a/include/boost/unordered/detail/unique.hpp +++ b/include/boost/unordered/detail/unique.hpp @@ -139,7 +139,7 @@ namespace boost { namespace unordered { namespace detail { typedef boost::unordered::detail::table_impl table; typedef boost::unordered::detail::set_extractor extractor; - typedef boost::unordered::detail::pick_policy::type policy; + typedef typename boost::unordered::detail::pick_policy::type policy; }; template @@ -164,7 +164,7 @@ namespace boost { namespace unordered { namespace detail { typedef boost::unordered::detail::map_extractor extractor; - typedef boost::unordered::detail::pick_policy::type policy; + typedef typename boost::unordered::detail::pick_policy::type policy; }; template From 9c62f83e74834473e1db84dc4aca8a5a43dbf9e9 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 24 Feb 2014 22:21:53 +0000 Subject: [PATCH 4/7] Add maintainers to metadata. --- meta/libraries.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/libraries.xml b/meta/libraries.xml index 39b4fdeb..7eaf2661 100644 --- a/meta/libraries.xml +++ b/meta/libraries.xml @@ -5,6 +5,7 @@ 1.36.0 Unordered Daniel James + Daniel James Unordered associative containers. false true From 850d69738b07c3fc82d088ee4b736e9b7ad29a58 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 27 Feb 2014 22:30:01 +0000 Subject: [PATCH 5/7] Switch to latest meta/libraries.json --- meta/libraries.json | 13 +++++++++++++ meta/libraries.xml | 14 -------------- 2 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 meta/libraries.json delete mode 100644 meta/libraries.xml diff --git a/meta/libraries.json b/meta/libraries.json new file mode 100644 index 00000000..82ecc839 --- /dev/null +++ b/meta/libraries.json @@ -0,0 +1,13 @@ +{ + "key": "unordered", + "boost-version": "1.36.0", + "name": "Unordered", + "authors": "Daniel James", + "maintainers": "Daniel James ", + "description": "Unordered associative containers.", + "std-proposal": false, + "std-tr1": true, + "category": [ + "Containers" + ] +} \ No newline at end of file diff --git a/meta/libraries.xml b/meta/libraries.xml deleted file mode 100644 index 7eaf2661..00000000 --- a/meta/libraries.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - unordered - 1.36.0 - Unordered - Daniel James - Daniel James - Unordered associative containers. - false - true - Containers - - From 4e6ce91dd020a395521e343d044f1653fe22b481 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 27 Feb 2014 22:46:07 +0000 Subject: [PATCH 6/7] Regenerate libraries.json with latest script. --- meta/libraries.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/libraries.json b/meta/libraries.json index 82ecc839..3e5f0bdc 100644 --- a/meta/libraries.json +++ b/meta/libraries.json @@ -2,8 +2,12 @@ "key": "unordered", "boost-version": "1.36.0", "name": "Unordered", - "authors": "Daniel James", - "maintainers": "Daniel James ", + "authors": [ + "Daniel James" + ], + "maintainers": [ + "Daniel James " + ], "description": "Unordered associative containers.", "std-proposal": false, "std-tr1": true, From 78bd2c0736538661aaee4c8c95223eace9844045 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 11 Mar 2014 03:48:26 +0000 Subject: [PATCH 7/7] Fix map allocators in introduction. Fixes trac #9719. --- doc/intro.qbk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/intro.qbk b/doc/intro.qbk index 257b959a..72c93b66 100644 --- a/doc/intro.qbk +++ b/doc/intro.qbk @@ -54,14 +54,14 @@ order to work with non-C++11 compilers and libraries. class Key, class Mapped, class Hash = ``[classref boost::hash]``, class Pred = std::equal_to, - class Alloc = std::allocator > + class Alloc = std::allocator > > class ``[classref boost::unordered_map unordered_map]``; template< class Key, class Mapped, class Hash = ``[classref boost::hash]``, class Pred = std::equal_to, - class Alloc = std::allocator > + class Alloc = std::allocator > > class ``[classref boost::unordered_multimap unordered_multimap]``; }