Index: boost/function_types/function_arity.hpp =================================================================== --- boost/function_types/function_arity.hpp (revision 84534) +++ boost/function_types/function_arity.hpp (working copy) @@ -9,7 +9,6 @@ #ifndef BOOST_FT_FUNCTION_ARITY_HPP_INCLUDED #define BOOST_FT_FUNCTION_ARITY_HPP_INCLUDED -#include #include #include @@ -25,7 +24,8 @@ template struct function_arity : mpl::if_ < function_types::is_callable_builtin - , typename components::function_arity, boost::blank + , typename components::function_arity + , struct not_a_callable_builtin >::type { BOOST_MPL_AUX_LAMBDA_SUPPORT(1,function_arity,(T)) Index: boost/function_types/parameter_types.hpp =================================================================== --- boost/function_types/parameter_types.hpp (revision 84534) +++ boost/function_types/parameter_types.hpp (working copy) @@ -9,7 +9,6 @@ #ifndef BOOST_FT_PARAMETER_TYPES_HPP_INCLUDED #define BOOST_FT_PARAMETER_TYPES_HPP_INCLUDED -#include #include #include @@ -42,7 +41,8 @@ template struct parameter_types : mpl::if_ < function_types::is_callable_builtin - , detail::parameter_types_impl, boost::blank + , detail::parameter_types_impl + , struct not_a_callable_builtin >::type { BOOST_MPL_AUX_LAMBDA_SUPPORT(2,parameter_types,(T,ClassTypeTransform)) Index: boost/function_types/result_type.hpp =================================================================== --- boost/function_types/result_type.hpp (revision 84534) +++ boost/function_types/result_type.hpp (working copy) @@ -9,8 +9,8 @@ #ifndef BOOST_FT_RESULT_TYPE_HPP_INCLUDED #define BOOST_FT_RESULT_TYPE_HPP_INCLUDED -#include #include +#include #include #include @@ -37,7 +37,7 @@ template struct result_type : mpl::if_ < function_types::is_callable_builtin - , detail::result_type_impl, boost::blank + , detail::result_type_impl, struct not_a_callable_builtin >::type { BOOST_MPL_AUX_LAMBDA_SUPPORT(1,result_type,(T))