[Boost-commit] svn:boost r86506 - trunk/boost/unordered/detail

Subject: [Boost-commit] svn:boost r86506 - trunk/boost/unordered/detail
From: dnljms_at_[hidden]
Date: 2013-10-28 16:32:52

Author: danieljames
Date: 2013-10-28 16:32:52 EDT (Mon, 28 Oct 2013)
New Revision: 86506
URL: http://svn.boost.org/trac/boost/changeset/86506

Log:
Extend the Visual C++ workaround to 3 parameters.

To avoid collision with piecewise construction.

Text files modified: 
   trunk/boost/unordered/detail/extract_key.hpp |    13 +++++++------                           
   1 files changed, 7 insertions(+), 6 deletions(-)

Modified: trunk/boost/unordered/detail/extract_key.hpp
==============================================================================
--- trunk/boost/unordered/detail/extract_key.hpp	Mon Oct 28 16:15:14 2013	(r86505)
+++ trunk/boost/unordered/detail/extract_key.hpp	2013-10-28 16:32:52 EDT (Mon, 28 Oct 2013)	(r86506)
@@ -118,15 +118,16 @@
             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&...)
+        template <class Arg1, class Arg2>
+        static no_key extract(Arg1 const&, Arg2 const&)
         {
             return no_key();
         }
-#else
-        template <class Arg, class Arg1>
-        static no_key extract(Arg const&, Arg1 const&)
+
+#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();
         }