boostorg/function
1
0
Fork 1
mirror of https://github.com/boostorg/function.git synced 2025-07-31 13:27:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove BOOST_NO_VOID_RETURNS workarounds

Browse Source
This commit is contained in:
Peter Dimov
2024-01-27 07:04:50 +02:00
parent 8d7f2ed1a5
commit ee600cf665
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,13 +47,8 @@
#define BOOST_FUNCTION_GET_INVOKER get_invoker #define BOOST_FUNCTION_GET_INVOKER get_invoker
#define BOOST_FUNCTION_VTABLE basic_vtable #define BOOST_FUNCTION_VTABLE basic_vtable
#ifndef BOOST_NO_VOID_RETURNS #define BOOST_FUNCTION_VOID_RETURN_TYPE void
# define BOOST_FUNCTION_VOID_RETURN_TYPE void #define BOOST_FUNCTION_RETURN(X) X
# define BOOST_FUNCTION_RETURN(X) X
#else
# define BOOST_FUNCTION_VOID_RETURN_TYPE boost::detail::function::unusable
# define BOOST_FUNCTION_RETURN(X) X; return BOOST_FUNCTION_VOID_RETURN_TYPE ()
#endif
namespace boost { namespace boost {
namespace detail { namespace detail {
@ -448,11 +443,7 @@ namespace boost {
template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS> template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS>
struct BOOST_FUNCTION_VTABLE struct BOOST_FUNCTION_VTABLE
{ {
#ifndef BOOST_NO_VOID_RETURNS
typedef R result_type; typedef R result_type;
#else
typedef typename function_return_type<R>::type result_type;
#endif // BOOST_NO_VOID_RETURNS
typedef result_type (*invoker_type)(function_buffer& typedef result_type (*invoker_type)(function_buffer&
BOOST_FUNCTION_COMMA BOOST_FUNCTION_COMMA
@ -661,12 +652,7 @@ namespace boost {
, public detail::function::variadic_function_base<T...> , public detail::function::variadic_function_base<T...>
{ {
public: public:
#ifndef BOOST_NO_VOID_RETURNS
typedef R result_type; typedef R result_type;
#else
typedef typename boost::detail::function::function_return_type<R>::type
result_type;
#endif // BOOST_NO_VOID_RETURNS
private: private:
typedef boost::detail::function::BOOST_FUNCTION_VTABLE< typedef boost::detail::function::BOOST_FUNCTION_VTABLE<