From 7b8e3d01def3b8438962247e083ce945d2ff4219 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 2 Jun 2016 23:52:23 +0100
Subject: [PATCH] Use argument SFINAE instead of return SFINAE

---
 doc/changes.qbk                               |  2 ++
 include/boost/unordered/detail/equivalent.hpp |  8 ++++----
 include/boost/unordered/detail/util.hpp       | 10 ++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/changes.qbk b/doc/changes.qbk
index 839b370f..54002878 100644
--- a/doc/changes.qbk
+++ b/doc/changes.qbk
@@ -276,5 +276,7 @@ C++11 support has resulted in some breaking changes:
 * Remove `BOOST_UNORDERED_DEPRECATED_EQUALITY` warning.
 * Simpler implementation of assignment, fixes an exception safety issue
   for `unordered_multiset` and `unordered_multimap`. Might be a little slower.
+* Stop using return value SFINAE which some older compilers have issues
+  with.
 
 [endsect]
diff --git a/include/boost/unordered/detail/equivalent.hpp b/include/boost/unordered/detail/equivalent.hpp
index 407b5f79..b7b40f1a 100644
--- a/include/boost/unordered/detail/equivalent.hpp
+++ b/include/boost/unordered/detail/equivalent.hpp
@@ -484,8 +484,8 @@ namespace boost { namespace unordered { namespace detail {
         // if hash function throws, or inserting > 1 element, basic exception
         // safety. Strong otherwise
         template <class I>
-        typename boost::unordered::detail::enable_if_forward<I, void>::type
-            insert_range(I i, I j)
+        void insert_range(I i, I j, typename
+            boost::unordered::detail::enable_if_forward<I, void*>::type = 0)
         {
             if(i == j) return;
 
@@ -508,8 +508,8 @@ namespace boost { namespace unordered { namespace detail {
         }
 
         template <class I>
-        typename boost::unordered::detail::disable_if_forward<I, void>::type
-            insert_range(I i, I j)
+        void insert_range(I i, I j, typename
+            boost::unordered::detail::disable_if_forward<I, void*>::type = 0)
         {
             node_constructor a(this->node_alloc());
             for (; i != j; ++i) {
diff --git a/include/boost/unordered/detail/util.hpp b/include/boost/unordered/detail/util.hpp
index 14dcfd84..0a406c85 100644
--- a/include/boost/unordered/detail/util.hpp
+++ b/include/boost/unordered/detail/util.hpp
@@ -125,17 +125,15 @@ namespace boost { namespace unordered { namespace detail {
     // insert_size/initial_size
 
     template <class I>
-    inline typename
-        boost::unordered::detail::enable_if_forward<I, std::size_t>::type
-        insert_size(I i, I j)
+    inline std::size_t insert_size(I i, I j, typename
+        boost::unordered::detail::enable_if_forward<I, void*>::type = 0)
     {
         return std::distance(i, j);
     }
 
     template <class I>
-    inline typename
-        boost::unordered::detail::disable_if_forward<I, std::size_t>::type
-        insert_size(I, I)
+    inline std::size_t insert_size(I, I, typename
+        boost::unordered::detail::disable_if_forward<I, void*>::type = 0)
     {
         return 1;
     }