sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/CallOnExit: Rework to use template instead of std::function

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-01-23 00:16:09 +01:00
parent 29786765c6
commit 2ebcddf9de
5 changed files with 85 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/Nazara/Core/CallOnExit.hpp
View File

@@ -8,29 +8,32 @@
#define NAZARA_CORE_CALLONEXIT_HPP
#include <Nazara/Prerequisites.hpp>
#include <functional>
#include <optional>
namespace Nz
{
template<typename F>
class CallOnExit
{
using Func = std::function<void()>;
public:
CallOnExit(Func func = nullptr);
CallOnExit() = default;
CallOnExit(F&& functor);
CallOnExit(const CallOnExit&) = delete;
CallOnExit(CallOnExit&&) noexcept = delete;
~CallOnExit();
void CallAndReset(Func func = nullptr);
void Reset(Func func = nullptr);
void CallAndReset();
void Reset();
CallOnExit& operator=(const CallOnExit&) = delete;
CallOnExit& operator=(CallOnExit&&) noexcept = default;
private:
Func m_func;
std::optional<F> m_functor;
};
template<typename F>
CallOnExit(F) -> CallOnExit<F>;
}
#include <Nazara/Core/CallOnExit.inl>

32
include/Nazara/Core/CallOnExit.inl
View File

@@ -15,24 +15,24 @@ namespace Nz
*/
/*!
* \brief Constructs a CallOnExit object with a function
* \brief Constructs a CallOnExit object with a functor
*
* \param func Function to call on exit
*/
inline CallOnExit::CallOnExit(Func func) :
m_func(func)
template<typename F>
CallOnExit<F>::CallOnExit(F&& functor) :
m_functor(std::move(functor))
{
}
/*!
* \brief Destructs the object and calls the function
*/
inline CallOnExit::~CallOnExit()
template<typename F>
CallOnExit<F>::~CallOnExit()
{
if (m_func)
m_func();
if (m_functor)
(*m_functor)();
}
/*!
@@ -40,13 +40,13 @@ namespace Nz
*
* \param func Function to call on exit
*/
inline void CallOnExit::CallAndReset(Func func)
template<typename F>
void CallOnExit<F>::CallAndReset()
{
if (m_func)
m_func();
if (m_functor)
(*m_functor)();
Reset(func);
m_functor.reset();
}
/*!
@@ -54,10 +54,10 @@ namespace Nz
*
* \param func Function to call on exit
*/
inline void CallOnExit::Reset(Func func)
template<typename F>
void CallOnExit<F>::Reset()
{
m_func = func;
m_functor.reset();
}
}