mirror of
https://github.com/boostorg/fusion.git
synced 2025-07-29 20:17:32 +02:00
Fix compile error on MSVC-10 and 11 due to no variadic templates.
see http://thread.gmane.org/gmane.comp.lib.boost.devel/255086 Signed-off-by: Kohei Takahashi <flast@flast.jp>
This commit is contained in:
@ -8,6 +8,11 @@
|
||||
#define FUSION_RESULT_OF_10272014_0654
|
||||
|
||||
#include <boost/utility/result_of.hpp>
|
||||
#if !(defined(BOOST_NO_CXX11_DECLTYPE) || defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES))
|
||||
#include <boost/mpl/if.hpp>
|
||||
#include <boost/mpl/or.hpp>
|
||||
#include <boost/mpl/has_xxx.hpp>
|
||||
#endif
|
||||
|
||||
namespace boost { namespace fusion { namespace detail
|
||||
{
|
||||
@ -16,7 +21,7 @@ namespace boost { namespace fusion { namespace detail
|
||||
// low level code. So far this is used only in the fold algorithm. This will
|
||||
// be removed once we overhaul fold.
|
||||
|
||||
#if defined(BOOST_NO_CXX11_DECLTYPE)
|
||||
#if defined(BOOST_NO_CXX11_DECLTYPE) || defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
|
||||
|
||||
template <typename Sig>
|
||||
struct result_of_with_decltype : boost::tr1_result_of<Sig> {};
|
||||
@ -31,9 +36,9 @@ namespace boost { namespace fusion { namespace detail
|
||||
|
||||
template <typename F, typename... Args>
|
||||
struct result_of_with_decltype<F(Args...)>
|
||||
: mpl::if_<mpl::or_<has_result_type<F>, detail::has_result<F>>,
|
||||
: mpl::if_<mpl::or_<has_result_type<F>, detail::has_result<F> >,
|
||||
boost::tr1_result_of<F(Args...)>,
|
||||
boost::detail::cpp0x_result_of<F(Args...)>>::type {};
|
||||
boost::detail::cpp0x_result_of<F(Args...)> >::type {};
|
||||
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user