boost_mirror/utility
1
0
Fork 0
mirror of https://github.com/boostorg/utility.git synced 2025-05-08 18:34:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove workaround for gcc-4.4, boost.config is correct now

Browse Source 
[SVN r80712]
This commit is contained in:
Eric Niebler 2012-09-26 18:47:08 +00:00
parent 3d650b7f92
commit 4a08e3d0bf
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/utility/detail/result_of_iterate.hpp
View File

@ -56,7 +56,7 @@ struct result_of<F(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T))>
namespace detail {
#ifdef BOOST_RESULT_OF_NO_SFINAE_EXPR
#ifdef BOOST_NO_SFINAE_EXPR
template<typename F>
struct BOOST_PP_CAT(result_of_callable_fun_2_, BOOST_PP_ITERATION());
@ -119,7 +119,7 @@ struct cpp0x_result_of_impl<F(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T)), fal
) type;
};
#else // BOOST_RESULT_OF_NO_SFINAE_EXPR
#else // BOOST_NO_SFINAE_EXPR
template<typename F BOOST_PP_ENUM_TRAILING_PARAMS(BOOST_PP_ITERATION(),typename T)>
struct cpp0x_result_of_impl<F(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T)),
@ -135,7 +135,7 @@ struct cpp0x_result_of_impl<F(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T)),
) type;
};
#endif // BOOST_RESULT_OF_NO_SFINAE_EXPR
#endif // BOOST_NO_SFINAE_EXPR
} // namespace detail

12
include/boost/utility/result_of.hpp
View File

@ -54,10 +54,6 @@
# endif
#endif
#if defined(BOOST_NO_SFINAE_EXPR) || (BOOST_WORKAROUND(__GNUC__, == 4) && __GNUC_MINOR__ < 5)
# define BOOST_RESULT_OF_NO_SFINAE_EXPR
#endif
namespace boost {
template<typename F> struct result_of;
@ -70,9 +66,7 @@ BOOST_MPL_HAS_XXX_TRAIT_DEF(result_type)
template<typename F, typename FArgs, bool HasResultType> struct tr1_result_of_impl;
#ifdef BOOST_RESULT_OF_NO_SFINAE_EXPR
template<typename T> T result_of_decay(T);
#ifdef BOOST_NO_SFINAE_EXPR
struct result_of_private_type {};
@ -122,7 +116,7 @@ struct result_of_wrap_callable_class<C &> {
template<typename F, bool TestCallability = true> struct cpp0x_result_of_impl;
#else // BOOST_RESULT_OF_NO_SFINAE_EXPR
#else // BOOST_NO_SFINAE_EXPR
template<typename T>
struct result_of_always_void
@ -132,7 +126,7 @@ struct result_of_always_void
template<typename F, typename Enable = void> struct cpp0x_result_of_impl {};
#endif // BOOST_RESULT_OF_NO_SFINAE_EXPR
#endif // BOOST_NO_SFINAE_EXPR
template<typename F>
struct result_of_void_impl