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_::type {}; + +#if defined(BOOST_GCC) && (BOOST_GCC <= 40000) +#define BOOST_MOVE_HELPERS_RETURN_SFINAE_BROKEN +#endif + template struct enable_if_convertible : enable_if< is_convertible, 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