From 6f3dee13a88622d4a4ed5ffc0447658db7a5e88f Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 28 Oct 2013 20:32:52 +0000 Subject: [PATCH] Extend the Visual C++ workaround to 3 parameters. To avoid collision with piecewise construction. [SVN r86506] --- include/boost/unordered/detail/extract_key.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/boost/unordered/detail/extract_key.hpp b/include/boost/unordered/detail/extract_key.hpp index 6db92799..92524b54 100644 --- a/include/boost/unordered/detail/extract_key.hpp +++ b/include/boost/unordered/detail/extract_key.hpp @@ -118,15 +118,16 @@ namespace detail { return no_key(); } -#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) - template - static no_key extract(Arg1 const&, Arg2 const&, Args const&...) + template + static no_key extract(Arg1 const&, Arg2 const&) { return no_key(); } -#else - template - static no_key extract(Arg const&, Arg1 const&) + +#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) + template + static no_key extract(Arg1 const&, Arg2 const&, Arg3 const&, + Args const&...) { return no_key(); }