only use decltype when Boost.Config says it's ok

[SVN r78195]
This commit is contained in:
Eric Niebler 2012-04-25 17:41:51 +00:00
parent b9411f807f
commit d5cacff7c6

View File

@ -38,7 +38,7 @@ struct tr1_result_of<F(BOOST_RESULT_OF_ARGS)>
(boost::detail::has_result_type<F>::value)> >::type { }; (boost::detail::has_result_type<F>::value)> >::type { };
#endif #endif
#ifdef BOOST_RESULT_OF_USE_DECLTYPE #if !defined(BOOST_NO_DECLTYPE) && defined(BOOST_RESULT_OF_USE_DECLTYPE)
// Uses declval following N3225 20.7.7.6 when F is not a pointer. // Uses declval following N3225 20.7.7.6 when F is not a pointer.
template<typename F BOOST_PP_COMMA_IF(BOOST_PP_ITERATION()) template<typename F BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
@ -71,7 +71,7 @@ struct cpp0x_result_of_impl<F(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T))>
} // namespace detail } // namespace detail
#else // defined(BOOST_RESULT_OF_USE_DECLTYPE) #else // !defined(BOOST_NO_DECLTYPE) && defined(BOOST_RESULT_OF_USE_DECLTYPE)
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551)) #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
template<typename F BOOST_PP_COMMA_IF(BOOST_PP_ITERATION()) template<typename F BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
@ -80,7 +80,7 @@ struct result_of<F(BOOST_RESULT_OF_ARGS)>
: tr1_result_of<F(BOOST_RESULT_OF_ARGS)> { }; : tr1_result_of<F(BOOST_RESULT_OF_ARGS)> { };
#endif #endif
#endif // defined(BOOST_RESULT_OF_USE_DECLTYPE) #endif // !defined(BOOST_NO_DECLTYPE) && defined(BOOST_RESULT_OF_USE_DECLTYPE)
#undef BOOST_RESULT_OF_ARGS #undef BOOST_RESULT_OF_ARGS