From ea47994cc061fc07a1a1f63dff888ce667206947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Sat, 17 Oct 2015 10:18:51 +0200
Subject: [PATCH] Minimize ifdef-ed code for
 BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN

---
 include/boost/intrusive/detail/key_nodeptr_comp.hpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/boost/intrusive/detail/key_nodeptr_comp.hpp b/include/boost/intrusive/detail/key_nodeptr_comp.hpp
index 171a2e8..1a5ec32 100644
--- a/include/boost/intrusive/detail/key_nodeptr_comp.hpp
+++ b/include/boost/intrusive/detail/key_nodeptr_comp.hpp
@@ -63,15 +63,13 @@ struct key_nodeptr_comp
    typename enable_if<is_node_ptr<T>, const key_type &>::type key_forward(const T &node) const
    {  return key_of_value()(*traits_->to_value_ptr(node));  }
 
+   template<class T>
    #if defined(BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN)
-   template<class T>
    const T &key_forward (const T &key, typename disable_if<is_node_ptr<T> >::type* =0) const
-   {  return key;  }
    #else
-   template<class T>
    typename disable_if<is_node_ptr<T>, const T &>::type key_forward(const T &key) const
-   {  return key;  }
    #endif
+   {  return key;  }
 
    //operator() 1 arg
    template<class KeyType>