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

---
 include/boost/container/detail/tree.hpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/include/boost/container/detail/tree.hpp b/include/boost/container/detail/tree.hpp
index 2f35c27..c2d6b1d 100644
--- a/include/boost/container/detail/tree.hpp
+++ b/include/boost/container/detail/tree.hpp
@@ -412,16 +412,13 @@ struct key_node_compare
       key_forward(const T &node) const
    {  return node.get_data();  }
 
+   template<class T>
    #if defined(BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN)
-   template<class T>
    const T &key_forward(const T &key, typename enable_if_c<!is_node<T>::value>::type* =0) const
-   {  return key; }
    #else
-   template<class T>
-   typename enable_if_c<!is_node<T>::value, const T &>::type
-      key_forward(const T &key) const
-   {  return key; }
+   typename enable_if_c<!is_node<T>::value, const T &>::type key_forward(const T &key) const
    #endif
+   {  return key; }
 
    template<class KeyType, class KeyType2>
    bool operator()(const KeyType &key1, const KeyType2 &key2) const