atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] fork on etk::Function

Browse Source
This commit is contained in:
Edouard DUPIN 2017-09-02 23:23:33 +02:00
parent 69b8f326d4
commit fa443fd991
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etk/Function.hpp
View File

@ -25,8 +25,8 @@ namespace etk {
// the above function pointer types, so we need some cast // the above function pointer types, so we need some cast
template <typename ETK_TYPE_FUNCTION_FUNCTOR> template <typename ETK_TYPE_FUNCTION_FUNCTOR>
static ETK_TYPE_FUNCTION_RETURN invoke_fn(ETK_TYPE_FUNCTION_FUNCTOR* _functor, static ETK_TYPE_FUNCTION_RETURN invoke_fn(ETK_TYPE_FUNCTION_FUNCTOR* _functor,
ETK_TYPE_FUNCTION_ARGS&&... _args) { ETK_TYPE_FUNCTION_ARGS... _args) {
return (*_functor)(etk::forward<ETK_TYPE_FUNCTION_ARGS>(_args)...); return (*_functor)(etk::move<ETK_TYPE_FUNCTION_ARGS>(_args)...);
} }
template <typename ETK_TYPE_FUNCTION_FUNCTOR> template <typename ETK_TYPE_FUNCTION_FUNCTOR>
static void construct_fn(ETK_TYPE_FUNCTION_FUNCTOR* _constructDestination, static void construct_fn(ETK_TYPE_FUNCTION_FUNCTOR* _constructDestination,
@ -87,9 +87,9 @@ namespace etk {
} }
} }
// other constructors, from nullptr, from function pointers // other constructors, from nullptr, from function pointers
ETK_TYPE_FUNCTION_RETURN operator()(ETK_TYPE_FUNCTION_ARGS&&... _args) { ETK_TYPE_FUNCTION_RETURN operator()(ETK_TYPE_FUNCTION_ARGS... _args) {
return invoke_f(m_dataPointer, return invoke_f(m_dataPointer,
etk::forward<ETK_TYPE_FUNCTION_ARGS>(_args)...); etk::move<ETK_TYPE_FUNCTION_ARGS>(_args)...);
} }
bool operator!= (nullptr_t) const { bool operator!= (nullptr_t) const {
return m_dataPointer != nullptr; return m_dataPointer != nullptr;