Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BAN: Member function pointers now use references instead of pointers 

This seems cleaner as class pointer cannot be null anymore
This commit is contained in:
Bananymous 2024-10-13 21:57:54 +03:00
parent df4f37d68d
commit 1c1a76d6d7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
BAN/include/BAN/Function.h
View File

@ -20,13 +20,13 @@ namespace BAN
new (m_storage) CallablePointer(function); new (m_storage) CallablePointer(function);
} }
template<typename Own> template<typename Own>
Function(Ret(Own::*function)(Args...), Own* owner) Function(Ret(Own::*function)(Args...), Own& owner)
{ {
static_assert(sizeof(CallableMember<Own>) <= m_size); static_assert(sizeof(CallableMember<Own>) <= m_size);
new (m_storage) CallableMember<Own>(function, owner); new (m_storage) CallableMember<Own>(function, owner);
} }
template<typename Own> template<typename Own>
Function(Ret(Own::*function)(Args...) const, const Own* owner) Function(Ret(Own::*function)(Args...) const, const Own& owner)
{ {
static_assert(sizeof(CallableMemberConst<Own>) <= m_size); static_assert(sizeof(CallableMemberConst<Own>) <= m_size);
new (m_storage) CallableMemberConst<Own>(function, owner); new (m_storage) CallableMemberConst<Own>(function, owner);
@ -91,36 +91,36 @@ namespace BAN
template<typename Own> template<typename Own>
struct CallableMember : public CallableBase struct CallableMember : public CallableBase
{ {
CallableMember(Ret(Own::*function)(Args...), Own* owner) CallableMember(Ret(Own::*function)(Args...), Own& owner)
: m_owner(owner) : m_owner(owner)
, m_function(function) , m_function(function)
{ } { }
virtual Ret call(Args... args) const override virtual Ret call(Args... args) const override
{ {
return (m_owner->*m_function)(forward<Args>(args)...); return (m_owner.*m_function)(forward<Args>(args)...);
} }
private: private:
Own* m_owner = nullptr; Own& m_owner;
Ret(Own::*m_function)(Args...) = nullptr; Ret(Own::*m_function)(Args...) = nullptr;
}; };
template<typename Own> template<typename Own>
struct CallableMemberConst : public CallableBase struct CallableMemberConst : public CallableBase
{ {
CallableMemberConst(Ret(Own::*function)(Args...) const, const Own* owner) CallableMemberConst(Ret(Own::*function)(Args...) const, const Own& owner)
: m_owner(owner) : m_owner(owner)
, m_function(function) , m_function(function)
{ } { }
virtual Ret call(Args... args) const override virtual Ret call(Args... args) const override
{ {
return (m_owner->*m_function)(forward<Args>(args)...); return (m_owner.*m_function)(forward<Args>(args)...);
} }
private: private:
const Own* m_owner = nullptr; const Own& m_owner;
Ret(Own::*m_function)(Args...) const = nullptr; Ret(Own::*m_function)(Args...) const = nullptr;
}; };