From 827f6de30eb513563a786341bca7bd02388123d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Sat, 17 Oct 2015 09:38:38 +0200
Subject: [PATCH] Move BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN to a more
 general header so that it can be used by other libraries like Intrusive

---
 include/boost/move/detail/meta_utils.hpp   | 5 +++++
 include/boost/move/detail/move_helpers.hpp | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/boost/move/detail/meta_utils.hpp b/include/boost/move/detail/meta_utils.hpp
index a8a61db..323c13a 100644
--- a/include/boost/move/detail/meta_utils.hpp
+++ b/include/boost/move/detail/meta_utils.hpp
@@ -332,6 +332,11 @@ struct eval_if
     : if_<C,T1,T2>::type
 {};
 
+
+#if defined(BOOST_GCC) && (BOOST_GCC <= 40000)
+#define BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN
+#endif
+
 template<class T, class U, class R = void>
 struct enable_if_convertible
    : enable_if< is_convertible<T, U>, R>
diff --git a/include/boost/move/detail/move_helpers.hpp b/include/boost/move/detail/move_helpers.hpp
index fabc5ec..7b62e26 100644
--- a/include/boost/move/detail/move_helpers.hpp
+++ b/include/boost/move/detail/move_helpers.hpp
@@ -36,10 +36,6 @@
 #define BOOST_MOVE_CATCH_FWD(U)    U &&
 #endif
 
-#if defined(BOOST_GCC) && (BOOST_GCC <= 40000)
-#define BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN
-#endif
-
 ////////////////////////////////////////
 //
 // BOOST_MOVE_CONVERSION_AWARE_CATCH