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

Merge Visual C++ 12 fix for Unordered.

Browse Source 
[SVN r86551]
This commit is contained in:
Daniel James
2013-11-03 19:20:09 +00:00
parent 9b9a1d21a6
commit 6ca8d5e0d9
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/boost/unordered/detail/extract_key.hpp
View File

@ -56,19 +56,19 @@ namespace detail {
return no_key(); return no_key();
} }
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args>
static no_key extract(Args const&...)
{
return no_key();
}
#else
template <class Arg> template <class Arg>
static no_key extract(Arg const&) static no_key extract(Arg const&)
{ {
return no_key(); return no_key();
} }
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class Arg1, class Arg2, class... Args>
static no_key extract(Arg1 const&, Arg2 const&, Args const&...)
{
return no_key();
}
#else
template <class Arg1, class Arg2> template <class Arg1, class Arg2>
static no_key extract(Arg1 const&, Arg2 const&) static no_key extract(Arg1 const&, Arg2 const&)
{ {
@ -107,14 +107,6 @@ namespace detail {
return k; return k;
} }
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args>
static no_key extract(Args const&...)
{
return no_key();
}
#else
static no_key extract() static no_key extract()
{ {
return no_key(); return no_key();
@ -126,8 +118,16 @@ namespace detail {
return no_key(); return no_key();
} }
template <class Arg, class Arg1> template <class Arg1, class Arg2>
static no_key extract(Arg const&, Arg1 const&) static no_key extract(Arg1 const&, Arg2 const&)
{
return no_key();
}
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class Arg1, class Arg2, class Arg3, class... Args>
static no_key extract(Arg1 const&, Arg2 const&, Arg3 const&,
Args const&...)
{ {
return no_key(); return no_key();
} }