boostorg/fusion
1
0
Fork 1
mirror of https://github.com/boostorg/fusion.git synced 2025-07-31 21:14:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from Flast/bugfix/invoke

Browse Source 
Fix tickets #10443 completely (SFINAE-friendly invoke).
This commit is contained in:
Joel de Guzman
2014-10-22 19:08:07 +08:00
parent ba723a2cad e014a1d173
commit 98b71154ec
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/boost/fusion/functional/invocation/invoke.hpp
View File

@@ -52,11 +52,12 @@
namespace boost { namespace fusion namespace boost { namespace fusion
{ {
namespace result_of //~ namespace result_of
{ //~ {
template <typename Function, class Sequence, class Enable = void> //~ template <typename Function, class Sequence,
struct invoke; //~ class Enable = unspecified>
} //~ struct invoke;
//~ }
//~ template <typename Function, class Sequence> //~ template <typename Function, class Sequence>
//~ inline typename result_of::invoke<Function, Sequence>::type //~ inline typename result_of::invoke<Function, Sequence>::type
@@ -72,6 +73,8 @@ namespace boost { namespace fusion
{ {
namespace ft = function_types; namespace ft = function_types;
template <typename, typename T = void> struct always_void_ { typedef T type; };
template< template<
typename Function, class Sequence, typename Function, class Sequence,
int N = result_of::size<Sequence>::value, int N = result_of::size<Sequence>::value,
@@ -107,7 +110,7 @@ namespace boost { namespace fusion
{ }; { };
template <typename Function, class Sequence, int N, bool RandomAccess, typename Enable> template <typename Function, class Sequence, int N, bool RandomAccess, typename Enable>
struct invoke_impl<Function,Sequence,N,true,RandomAccess> struct invoke_impl<Function,Sequence,N,true,RandomAccess,Enable>
: mpl::if_< ft::is_member_function_pointer<Function>, : mpl::if_< ft::is_member_function_pointer<Function>,
invoke_mem_fn<Function,Sequence,N,RandomAccess>, invoke_mem_fn<Function,Sequence,N,RandomAccess>,
invoke_nonmember_builtin<Function,Sequence,N,RandomAccess> invoke_nonmember_builtin<Function,Sequence,N,RandomAccess>
@@ -115,7 +118,7 @@ namespace boost { namespace fusion
{ }; { };
template <typename Function, class Sequence, bool RandomAccess, typename Enable> template <typename Function, class Sequence, bool RandomAccess, typename Enable>
struct invoke_impl<Function,Sequence,1,true,RandomAccess> struct invoke_impl<Function,Sequence,1,true,RandomAccess,Enable>
: mpl::eval_if< ft::is_member_pointer<Function>, : mpl::eval_if< ft::is_member_pointer<Function>,
mpl::if_< ft::is_member_function_pointer<Function>, mpl::if_< ft::is_member_function_pointer<Function>,
invoke_mem_fn<Function,Sequence,1,RandomAccess>, invoke_mem_fn<Function,Sequence,1,RandomAccess>,
@@ -158,18 +161,14 @@ namespace boost { namespace fusion
namespace result_of namespace result_of
{ {
template <typename Function, class Sequence, class Enable> template <typename Function, class Sequence,
struct invoke; class Enable =
typename detail::invoke_impl<
template <typename Function, class Sequence> typename boost::remove_reference<Function>::type, Sequence
struct invoke<Function, Sequence, >::result_type>
typename detail::invoke_impl< struct invoke
typename boost::remove_reference<Function>::type, Sequence
>::result_type>
{ {
typedef typename detail::invoke_impl< typedef Enable type;
typename boost::remove_reference<Function>::type, Sequence
>::result_type type;
}; };
} }
@@ -208,7 +207,9 @@ namespace boost { namespace fusion
template <typename Function, class Sequence> template <typename Function, class Sequence>
struct invoke_impl<Function,Sequence,N,false,true, struct invoke_impl<Function,Sequence,N,false,true,
typename boost::result_of<Function(BOOST_PP_ENUM(N,M,~)) >::type> typename always_void_<
typename boost::result_of<Function(BOOST_PP_ENUM(N,M,~)) >::type
>::type>
{ {
public: public:
@@ -299,7 +300,12 @@ namespace boost { namespace fusion
fusion::next(BOOST_PP_CAT(i,BOOST_PP_DEC(j))); fusion::next(BOOST_PP_CAT(i,BOOST_PP_DEC(j)));
template <typename Function, class Sequence> template <typename Function, class Sequence>
struct invoke_impl<Function,Sequence,N,false,false> struct invoke_impl<Function,Sequence,N,false,false,
typename always_void_<
#define L(z,j,data) typename invoke_param_types<Sequence,N>::BOOST_PP_CAT(T, j)
typename boost::result_of<Function(BOOST_PP_ENUM(N,L,~))>::type
>::type>
#undef L
{ {
private: private:
typedef invoke_param_types<Sequence,N> seq; typedef invoke_param_types<Sequence,N> seq;