feedc0de/boost_fusion
1
0
Fork 0
forked from boostorg/fusion
Code Pull Requests Activity

Merge pull request #29 from Flast/bugfix/msvc-10.0

Browse Source 
Fix compile error on MSVC-10 and 11 due to no variadic templates.
This commit is contained in:
Joel de Guzman
2014-10-31 08:21:16 +08:00
parent 0ffc0f04e3 c10b94472d
commit 6b6d613e15
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/boost/fusion/support/detail/result_of.hpp
View File

@ -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