Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions include/boost/compat/move_only_function.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,22 @@ struct move_only_function_base
{
}

template<class VT, class ...CArgs>
void init_object( std::false_type /* use_sbo */, CArgs&& ...args )
{
s_.pobj_ = new VT( std::forward<CArgs>( args )... );
invoke_ = &mo_invoke_object_holder<RQ, Const, NoEx, VT, R, Args...>::invoke_object;
manager_ = &manage_object<VT>;
}

template<class VT, class ...CArgs>
void init_object( std::true_type /* use_sbo */, CArgs&& ...args )
{
new( s_.addr() ) VT( std::forward<CArgs>( args )... );
invoke_ = &mo_invoke_local_holder<RQ, Const, NoEx, VT, R, Args...>::invoke_local;
manager_ = &manage_local<VT>;
}

template<class VT, class ...CArgs>
void init( std::false_type /* is_function */, CArgs&& ...args )
{
Expand All @@ -444,18 +460,7 @@ struct move_only_function_base
return;
}

if( !storage::use_sbo<VT>() )
{
s_.pobj_ = new VT( std::forward<CArgs>( args )... );
invoke_ = &mo_invoke_object_holder<RQ, Const, NoEx, VT, R, Args...>::invoke_object;
manager_ = &manage_object<VT>;
}
else
{
new( s_.addr() ) VT( std::forward<CArgs>( args )... );
invoke_ = &mo_invoke_local_holder<RQ, Const, NoEx, VT, R, Args...>::invoke_local;
manager_ = &manage_local<VT>;
}
init_object<VT>( std::integral_constant<bool, storage::use_sbo<VT>()>{}, std::forward<CArgs>( args )... );
}

template<class VT, class ...CArgs>
Expand Down