Subject: [Boost-commit] svn:boost r86551 - in branches/release: . boost boost/unordered boost/unordered/detail
From: dnljms_at_[hidden]
Date: 2013-11-03 14:20:09
Author: danieljames
Date: 2013-11-03 14:20:09 EST (Sun, 03 Nov 2013)
New Revision: 86551
URL: http://svn.boost.org/trac/boost/changeset/86551
Log:
Merge Visual C++ 12 fix for Unordered.
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/boost/unordered/ (props changed)
Text files modified:
branches/release/boost/unordered/detail/extract_key.hpp | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
Modified: branches/release/boost/unordered/detail/extract_key.hpp
==============================================================================
--- branches/release/boost/unordered/detail/extract_key.hpp Sun Nov 3 12:55:22 2013 (r86550)
+++ branches/release/boost/unordered/detail/extract_key.hpp 2013-11-03 14:20:09 EST (Sun, 03 Nov 2013) (r86551)
@@ -56,19 +56,19 @@
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>
static no_key extract(Arg const&)
{
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>
static no_key extract(Arg1 const&, Arg2 const&)
{
@@ -107,27 +107,27 @@
return k;
}
-#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
- template <class... Args>
- static no_key extract(Args const&...)
+ static no_key extract()
{
return no_key();
}
-#else
- static no_key extract()
+ template <class Arg>
+ static no_key extract(Arg const&)
{
return no_key();
}
- template <class Arg>
- static no_key extract(Arg const&)
+ template <class Arg1, class Arg2>
+ static no_key extract(Arg1 const&, Arg2 const&)
{
return no_key();
}
- 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();
}