Ticket #8623: function_types.blank.patch

boost/function_types/function_arity.hpp

@@ -9 +9 @@
 #ifndef BOOST_FT_FUNCTION_ARITY_HPP_INCLUDED
 #define BOOST_FT_FUNCTION_ARITY_HPP_INCLUDED
 
-#include <boost/blank.hpp>
 #include <boost/mpl/if.hpp>
 
 #include <boost/mpl/aux_/lambda_support.hpp>
@@ -25 +24 @@
     template<typename T> struct function_arity
       : mpl::if_
         < function_types::is_callable_builtin<T>
-        , typename components<T>::function_arity, boost::blank
+        , typename components<T>::function_arity
+        , struct not_a_callable_builtin
         >::type
     {
       BOOST_MPL_AUX_LAMBDA_SUPPORT(1,function_arity,(T)) 

boost/function_types/parameter_types.hpp

@@ -9 +9 @@
 #ifndef BOOST_FT_PARAMETER_TYPES_HPP_INCLUDED
 #define BOOST_FT_PARAMETER_TYPES_HPP_INCLUDED
 
-#include <boost/blank.hpp>
 #include <boost/mpl/if.hpp>
 
 #include <boost/mpl/aux_/lambda_support.hpp>
@@ -42 +41 @@
     template<typename T, typename ClassTypeTransform> struct parameter_types
       : mpl::if_
         < function_types::is_callable_builtin<T>
-        , detail::parameter_types_impl<T,ClassTypeTransform>, boost::blank
+        , detail::parameter_types_impl<T,ClassTypeTransform>
+        , struct not_a_callable_builtin
         >::type
     {
       BOOST_MPL_AUX_LAMBDA_SUPPORT(2,parameter_types,(T,ClassTypeTransform)) 

boost/function_types/result_type.hpp

@@ -9 +9 @@
 #ifndef BOOST_FT_RESULT_TYPE_HPP_INCLUDED
 #define BOOST_FT_RESULT_TYPE_HPP_INCLUDED
 
-#include <boost/blank.hpp>
 #include <boost/mpl/if.hpp>
+#include <boost/mpl/void.hpp>
 
 #include <boost/mpl/aux_/lambda_support.hpp>
 #include <boost/type_traits/detail/template_arity_spec.hpp>
@@ -37 +37 @@
     template<typename T> struct result_type
       : mpl::if_
         < function_types::is_callable_builtin<T>
-        , detail::result_type_impl<T>, boost::blank
+        , detail::result_type_impl<T>, struct not_a_callable_builtin
         >::type
     { 
       BOOST_MPL_AUX_LAMBDA_SUPPORT(1,result_type,(T))