feedc0de/boost_function
1
0
Fork 0
forked from boostorg/function
Code Pull Requests Activity

Remove uses of BOOST_FUNCTION_TEMPLATE_ARGS

Browse Source
This commit is contained in:
Peter Dimov
2024-01-28 03:04:43 +02:00
parent bf2b23d40f
commit fa845b2fe3
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
include/boost/function/function_template.hpp
View File

@ -18,7 +18,6 @@
# pragma warning( disable : 4127 ) // "conditional expression is constant" # pragma warning( disable : 4127 ) // "conditional expression is constant"
#endif #endif
#define BOOST_FUNCTION_TEMPLATE_ARGS T...
#define BOOST_FUNCTION_PARMS T... a #define BOOST_FUNCTION_PARMS T... a
#define BOOST_FUNCTION_ARGS static_cast<T&&>(a)... #define BOOST_FUNCTION_ARGS static_cast<T&&>(a)...
@ -185,12 +184,12 @@ namespace boost {
void_function_invoker< void_function_invoker<
FunctionPtr, FunctionPtr,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>, >,
function_invoker< function_invoker<
FunctionPtr, FunctionPtr,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
> >
>::type type; >::type type;
}; };
@ -206,12 +205,12 @@ namespace boost {
void_function_obj_invoker< void_function_obj_invoker<
FunctionObj, FunctionObj,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>, >,
function_obj_invoker< function_obj_invoker<
FunctionObj, FunctionObj,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
> >
>::type type; >::type type;
}; };
@ -227,12 +226,12 @@ namespace boost {
void_function_ref_invoker< void_function_ref_invoker<
FunctionObj, FunctionObj,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>, >,
function_ref_invoker< function_ref_invoker<
FunctionObj, FunctionObj,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
> >
>::type type; >::type type;
}; };
@ -250,12 +249,12 @@ namespace boost {
void_member_invoker< void_member_invoker<
MemberPtr, MemberPtr,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>, >,
member_invoker< member_invoker<
MemberPtr, MemberPtr,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
> >
>::type type; >::type type;
}; };
@ -284,7 +283,7 @@ namespace boost {
typedef typename get_function_invoker< typedef typename get_function_invoker<
FunctionPtr, FunctionPtr,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>::type >::type
invoker_type; invoker_type;
@ -298,7 +297,7 @@ namespace boost {
typedef typename get_function_invoker< typedef typename get_function_invoker<
FunctionPtr, FunctionPtr,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>::type >::type
invoker_type; invoker_type;
@ -318,7 +317,7 @@ namespace boost {
typedef typename get_member_invoker< typedef typename get_member_invoker<
MemberPtr, MemberPtr,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>::type >::type
invoker_type; invoker_type;
@ -332,7 +331,7 @@ namespace boost {
typedef typename get_member_invoker< typedef typename get_member_invoker<
MemberPtr, MemberPtr,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>::type >::type
invoker_type; invoker_type;
@ -352,7 +351,7 @@ namespace boost {
typedef typename get_function_obj_invoker< typedef typename get_function_obj_invoker<
FunctionObj, FunctionObj,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>::type >::type
invoker_type; invoker_type;
@ -366,7 +365,7 @@ namespace boost {
typedef typename get_function_obj_invoker< typedef typename get_function_obj_invoker<
FunctionObj, FunctionObj,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>::type >::type
invoker_type; invoker_type;
@ -385,7 +384,7 @@ namespace boost {
typedef typename get_function_ref_invoker< typedef typename get_function_ref_invoker<
typename RefWrapper::type, typename RefWrapper::type,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>::type >::type
invoker_type; invoker_type;
@ -399,7 +398,7 @@ namespace boost {
typedef typename get_function_ref_invoker< typedef typename get_function_ref_invoker<
typename RefWrapper::type, typename RefWrapper::type,
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>::type >::type
invoker_type; invoker_type;
@ -422,7 +421,7 @@ namespace boost {
typedef result_type (*invoker_type)(function_buffer& typedef result_type (*invoker_type)(function_buffer&
, ,
BOOST_FUNCTION_TEMPLATE_ARGS); T...);
template<typename F> template<typename F>
bool assign_to(F f, function_buffer& functor) const bool assign_to(F f, function_buffer& functor) const
@ -624,7 +623,7 @@ namespace boost {
private: private:
typedef boost::detail::function::basic_vtable< typedef boost::detail::function::basic_vtable<
R, BOOST_FUNCTION_TEMPLATE_ARGS> R, T...>
vtable_type; vtable_type;
vtable_type* get_vtable() const { vtable_type* get_vtable() const {
@ -828,7 +827,7 @@ namespace boost {
typedef boost::detail::function::get_invoker<tag> get_invoker; typedef boost::detail::function::get_invoker<tag> get_invoker;
typedef typename get_invoker:: typedef typename get_invoker::
template apply<Functor, R, template apply<Functor, R,
BOOST_FUNCTION_TEMPLATE_ARGS> T...>
handler_type; handler_type;
typedef typename handler_type::invoker_type invoker_type; typedef typename handler_type::invoker_type invoker_type;
@ -862,7 +861,7 @@ namespace boost {
typedef boost::detail::function::get_invoker<tag> get_invoker; typedef boost::detail::function::get_invoker<tag> get_invoker;
typedef typename get_invoker:: typedef typename get_invoker::
template apply_a<Functor, Allocator, R, template apply_a<Functor, Allocator, R,
BOOST_FUNCTION_TEMPLATE_ARGS> T...>
handler_type; handler_type;
typedef typename handler_type::invoker_type invoker_type; typedef typename handler_type::invoker_type invoker_type;
@ -941,11 +940,11 @@ namespace boost {
template<typename R, typename... T> template<typename R, typename... T>
inline void swap(function_n< inline void swap(function_n<
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>& f1, >& f1,
function_n< function_n<
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS T...
>& f2) >& f2)
{ {
f1.swap(f2); f1.swap(f2);
@ -955,26 +954,26 @@ namespace boost {
template<typename R, typename... T> template<typename R, typename... T>
void operator==(const function_n< void operator==(const function_n<
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS>&, T...>&,
const function_n< const function_n<
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS>&); T...>&);
template<typename R, typename... T> template<typename R, typename... T>
void operator!=(const function_n< void operator!=(const function_n<
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS>&, T...>&,
const function_n< const function_n<
R, R,
BOOST_FUNCTION_TEMPLATE_ARGS>& ); T...>& );
#define BOOST_FUNCTION_PARTIAL_SPEC R (BOOST_FUNCTION_TEMPLATE_ARGS) #define BOOST_FUNCTION_PARTIAL_SPEC R (T...)
template<typename R, template<typename R,
typename... T> typename... T>
class function<BOOST_FUNCTION_PARTIAL_SPEC> class function<BOOST_FUNCTION_PARTIAL_SPEC>
: public function_n<R, BOOST_FUNCTION_TEMPLATE_ARGS> : public function_n<R, T...>
{ {
typedef function_n<R, BOOST_FUNCTION_TEMPLATE_ARGS> base_type; typedef function_n<R, T...> base_type;
typedef function self_type; typedef function self_type;
struct clear_type {}; struct clear_type {};
@ -1058,7 +1057,6 @@ public:
} // end namespace boost } // end namespace boost
// Cleanup after ourselves... // Cleanup after ourselves...
#undef BOOST_FUNCTION_TEMPLATE_ARGS
#undef BOOST_FUNCTION_PARMS #undef BOOST_FUNCTION_PARMS
#undef BOOST_FUNCTION_PARM #undef BOOST_FUNCTION_PARM
#ifdef BOOST_FUNCTION_ARG #ifdef BOOST_FUNCTION_ARG