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

Remove uses of BOOST_FUNCTION_RETURN

Browse Source
This commit is contained in:
Peter Dimov
2024-01-28 03:09:43 +02:00
parent a46646ecaa
commit 0601af0be4
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,8 +18,6 @@
# pragma warning( disable : 4127 ) // "conditional expression is constant" # pragma warning( disable : 4127 ) // "conditional expression is constant"
#endif #endif
#define BOOST_FUNCTION_RETURN(X) X
namespace boost { namespace boost {
namespace detail { namespace detail {
namespace function { namespace function {
@ -51,7 +49,7 @@ namespace boost {
{ {
FunctionPtr f = reinterpret_cast<FunctionPtr>(function_ptr.members.func_ptr); FunctionPtr f = reinterpret_cast<FunctionPtr>(function_ptr.members.func_ptr);
BOOST_FUNCTION_RETURN(f(static_cast<T&&>(a)...)); f(static_cast<T&&>(a)...);
} }
}; };
@ -92,7 +90,7 @@ namespace boost {
f = reinterpret_cast<FunctionObj*>(function_obj_ptr.data); f = reinterpret_cast<FunctionObj*>(function_obj_ptr.data);
else else
f = reinterpret_cast<FunctionObj*>(function_obj_ptr.members.obj_ptr); f = reinterpret_cast<FunctionObj*>(function_obj_ptr.members.obj_ptr);
BOOST_FUNCTION_RETURN((*f)(static_cast<T&&>(a)...)); (*f)(static_cast<T&&>(a)...);
} }
}; };
@ -127,7 +125,7 @@ namespace boost {
{ {
FunctionObj* f = FunctionObj* f =
reinterpret_cast<FunctionObj*>(function_obj_ptr.members.obj_ptr); reinterpret_cast<FunctionObj*>(function_obj_ptr.members.obj_ptr);
BOOST_FUNCTION_RETURN((*f)(static_cast<T&&>(a)...)); (*f)(static_cast<T&&>(a)...);
} }
}; };
@ -164,7 +162,7 @@ namespace boost {
{ {
MemberPtr* f = MemberPtr* f =
reinterpret_cast<MemberPtr*>(function_obj_ptr.data); reinterpret_cast<MemberPtr*>(function_obj_ptr.data);
BOOST_FUNCTION_RETURN(boost::mem_fn(*f)(static_cast<T&&>(a)...)); boost::mem_fn(*f)(static_cast<T&&>(a)...);
} }
}; };
#endif #endif
@ -1059,7 +1057,6 @@ public:
#endif #endif
#undef BOOST_FUNCTION_ARG_TYPE #undef BOOST_FUNCTION_ARG_TYPE
#undef BOOST_FUNCTION_ARG_TYPES #undef BOOST_FUNCTION_ARG_TYPES
#undef BOOST_FUNCTION_RETURN
#if defined(BOOST_MSVC) #if defined(BOOST_MSVC)
# pragma warning( pop ) # pragma warning( pop )