From cd88cb4a30a7c87021ec39a60a4aef5b5249ca61 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 7 May 2012 12:22:24 +0000 Subject: [PATCH] Unordered: 'full construct' requires SFINAE expressions. [SVN r78367] --- include/boost/unordered/detail/allocator_helpers.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/unordered/detail/allocator_helpers.hpp b/include/boost/unordered/detail/allocator_helpers.hpp index dd92373a..5cce480c 100644 --- a/include/boost/unordered/detail/allocator_helpers.hpp +++ b/include/boost/unordered/detail/allocator_helpers.hpp @@ -205,13 +205,13 @@ namespace boost { namespace unordered { namespace detail { #else -#if defined(BOOST_UNORDERED_VARIADIC_MOVE) +#if defined(BOOST_UNORDERED_VARIADIC_MOVE) && \ + !defined(BOOST_NO_SFINAE_EXPR) # define BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT 1 #else # define BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT 0 #endif - // TODO: Does this match std::allocator_traits::rebind_alloc? template struct rebind_wrap @@ -407,7 +407,7 @@ namespace boost { namespace unordered { namespace detail { public: -#if defined(BOOST_UNORDERED_VARIADIC_MOVE) +#if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT template static typename boost::enable_if_c<