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

Unordered: Remove deprecated variadic pair constructors.

Browse Source 
This was emulating them as specified in older standard drafts.

[SVN r81384]
This commit is contained in:
Daniel James committed 2012-11-17 10:28:35 +00:00
1 parent 73c0d85ae6
commit 7eefe62efe
7 files changed
+7 -195
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/boost/unordered/detail/extract_key.hpp
+3 -16
View File
@@ -93,11 +93,6 @@ namespace detail {
return v.first;
}
static key_type const& extract(key_type const& v)
{
return v;
}
template <class Second>
static key_type const& extract(std::pair<key_type, Second> const& v)
{
@@ -111,14 +106,13 @@ namespace detail {
return v.first;
}
#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
template <class Arg1, class... Args>
static key_type const& extract(key_type const& k,
Arg1 const&, Args const&...)
template <class Arg1>
static key_type const& extract(key_type const& k, Arg1 const&)
{
return k;
}
#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
template <class... Args>
static no_key extract(Args const&...)
{
@@ -126,12 +120,6 @@ namespace detail {
}
#else
template <class Arg1>
static key_type const& extract(key_type const& k, Arg1 const&)
{
return k;
}
static no_key extract()
{
return no_key();
@@ -195,7 +183,6 @@ BOOST_UNORDERED_KEY_FROM_TUPLE(boost::)
BOOST_UNORDERED_KEY_FROM_TUPLE(std::)
#endif
static bool compare_mapped(value_type const& x, value_type const& y)
{
return x.second == y.second;