Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r78367 - trunk/boost/unordered/detail
From: dnljms_at_[hidden]
Date: 2012-05-07 08:22:26


Author: danieljames
Date: 2012-05-07 08:22:24 EDT (Mon, 07 May 2012)
New Revision: 78367
URL: http://svn.boost.org/trac/boost/changeset/78367

Log:
Unordered: 'full construct' requires SFINAE expressions.
Text files modified:
   trunk/boost/unordered/detail/allocator_helpers.hpp | 6 +++---
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/boost/unordered/detail/allocator_helpers.hpp
==============================================================================
--- trunk/boost/unordered/detail/allocator_helpers.hpp (original)
+++ trunk/boost/unordered/detail/allocator_helpers.hpp 2012-05-07 08:22:24 EDT (Mon, 07 May 2012)
@@ -205,13 +205,13 @@
 
 #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<Alloc>::rebind_alloc<T>?
     template <typename Alloc, typename T>
     struct rebind_wrap
@@ -407,7 +407,7 @@
 
     public:
 
-#if defined(BOOST_UNORDERED_VARIADIC_MOVE)
+#if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT
 
         template <typename T, typename... Args>
         static typename boost::enable_if_c<


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk