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

Remove uses of BOOST_FUNCTION_PARMS

Browse Source
This commit is contained in:
Peter Dimov
2024-01-28 03:06:03 +02:00
parent fa845b2fe3
commit a3249ce5db
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,6 @@
# pragma warning( disable : 4127 ) // "conditional expression is constant"
#endif
#define BOOST_FUNCTION_PARMS T... a
#define BOOST_FUNCTION_ARGS static_cast<T&&>(a)...
#define BOOST_FUNCTION_VOID_RETURN_TYPE void
@ -35,7 +34,7 @@ namespace boost {
struct function_invoker
{
static R invoke(function_buffer& function_ptr,
BOOST_FUNCTION_PARMS)
T... a)
{
FunctionPtr f = reinterpret_cast<FunctionPtr>(function_ptr.members.func_ptr);
return f(BOOST_FUNCTION_ARGS);
@ -51,7 +50,7 @@ namespace boost {
{
static BOOST_FUNCTION_VOID_RETURN_TYPE
invoke(function_buffer& function_ptr,
BOOST_FUNCTION_PARMS)
T... a)
{
FunctionPtr f = reinterpret_cast<FunctionPtr>(function_ptr.members.func_ptr);
@ -67,7 +66,7 @@ namespace boost {
struct function_obj_invoker
{
static R invoke(function_buffer& function_obj_ptr,
BOOST_FUNCTION_PARMS)
T... a)
{
FunctionObj* f;
@ -88,7 +87,7 @@ namespace boost {
{
static BOOST_FUNCTION_VOID_RETURN_TYPE
invoke(function_buffer& function_obj_ptr,
BOOST_FUNCTION_PARMS)
T... a)
{
FunctionObj* f;
@ -108,7 +107,7 @@ namespace boost {
struct function_ref_invoker
{
static R invoke(function_buffer& function_obj_ptr,
BOOST_FUNCTION_PARMS)
T... a)
{
FunctionObj* f =
@ -126,7 +125,7 @@ namespace boost {
{
static BOOST_FUNCTION_VOID_RETURN_TYPE
invoke(function_buffer& function_obj_ptr,
BOOST_FUNCTION_PARMS)
T... a)
{
FunctionObj* f =
@ -145,7 +144,7 @@ namespace boost {
struct member_invoker
{
static R invoke(function_buffer& function_obj_ptr,
BOOST_FUNCTION_PARMS)
T... a)
{
MemberPtr* f =
@ -163,7 +162,7 @@ namespace boost {
{
static BOOST_FUNCTION_VOID_RETURN_TYPE
invoke(function_buffer& function_obj_ptr,
BOOST_FUNCTION_PARMS)
T... a)
{
MemberPtr* f =
@ -684,7 +683,7 @@ namespace boost {
~function_n() { clear(); }
result_type operator()(BOOST_FUNCTION_PARMS) const
result_type operator()(T... a) const
{
if (this->empty())
boost::throw_exception(bad_function_call());
@ -1057,7 +1056,6 @@ public:
} // end namespace boost
// Cleanup after ourselves...
#undef BOOST_FUNCTION_PARMS
#undef BOOST_FUNCTION_PARM
#ifdef BOOST_FUNCTION_ARG
# undef BOOST_FUNCTION_ARG