Remove uses of BOOST_FUNCTION_VTABLE

This commit is contained in:
Peter Dimov
2024-01-28 03:01:14 +02:00
parent 916b44374d
commit 5b5b2de461

View File

@ -26,9 +26,6 @@
// Always have commas (zero args case is handled with variadics too) // Always have commas (zero args case is handled with variadics too)
#define BOOST_FUNCTION_COMMA , #define BOOST_FUNCTION_COMMA ,
// Class names used in this version of the code
#define BOOST_FUNCTION_VTABLE basic_vtable
#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
@ -423,7 +420,7 @@ namespace boost {
* destructors, base classes, etc. * destructors, base classes, etc.
*/ */
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 basic_vtable
{ {
typedef R result_type; typedef R result_type;
@ -630,7 +627,7 @@ namespace boost {
typedef R result_type; typedef R result_type;
private: private:
typedef boost::detail::function::BOOST_FUNCTION_VTABLE< typedef boost::detail::function::basic_vtable<
R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS> R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_ARGS>
vtable_type; vtable_type;
@ -1065,7 +1062,6 @@ public:
} // end namespace boost } // end namespace boost
// Cleanup after ourselves... // Cleanup after ourselves...
#undef BOOST_FUNCTION_VTABLE
#undef BOOST_FUNCTION_COMMA #undef BOOST_FUNCTION_COMMA
#undef BOOST_FUNCTION_TEMPLATE_PARMS #undef BOOST_FUNCTION_TEMPLATE_PARMS
#undef BOOST_FUNCTION_TEMPLATE_ARGS #undef BOOST_FUNCTION_TEMPLATE_ARGS