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

Fix #10443 completely.

Browse Source 
Signed-off-by: Kohei Takahashi <flast@flast.jp>
This commit is contained in:
Kohei Takahashi
2014-10-22 19:42:48 +09:00
parent 812e9e379e
commit e014a1d173
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
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,
@ -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;