diff --git a/core/sourcehook/generate/sourcehook.hxx b/core/sourcehook/generate/sourcehook.hxx index 067fc9d..61b549e 100755 --- a/core/sourcehook/generate/sourcehook.hxx +++ b/core/sourcehook/generate/sourcehook.hxx @@ -671,19 +671,19 @@ namespace SourceHook * used when the core delegates receive different args than the root proto (eg, varargs!) * */ - template + template struct BaseMethodInvoker { public: typedef Result (EmptyClass::*EmptyDelegate)(Args...); }; - template + template struct VoidMethodInvoker { public: typedef std::bool_constant has_return; - typedef BaseMethodInvoker base; + typedef BaseMethodInvoker base; static void Invoke(IDelegate* delegate, void* result, Args... args) { @@ -710,12 +710,12 @@ namespace SourceHook } }; - template + template struct ReturningMethodInvoker { public: typedef std::bool_constant has_return; - typedef BaseMethodInvoker base; + typedef BaseMethodInvoker base; static void Invoke(IDelegate* delegate, Result* result, Args... args) @@ -1010,8 +1010,8 @@ namespace SourceHook */ typedef typename metaprogramming::if_else< std::is_void::value, - detail::VoidMethodInvoker, - detail::ReturningMethodInvoker + detail::VoidMethodInvoker, + detail::ReturningMethodInvoker >::type Invoker; /** diff --git a/core/sourcehook/sourcehook.h b/core/sourcehook/sourcehook.h index 04e5a0d..29910bb 100644 --- a/core/sourcehook/sourcehook.h +++ b/core/sourcehook/sourcehook.h @@ -671,19 +671,19 @@ namespace SourceHook * used when the core delegates receive different args than the root proto (eg, varargs!) * */ - template + template struct BaseMethodInvoker { public: typedef Result (EmptyClass::*EmptyDelegate)(Args...); }; - template + template struct VoidMethodInvoker { public: typedef std::bool_constant has_return; - typedef BaseMethodInvoker base; + typedef BaseMethodInvoker base; static void Invoke(IDelegate* delegate, void* result, Args... args) { @@ -710,12 +710,12 @@ namespace SourceHook } }; - template + template struct ReturningMethodInvoker { public: typedef std::bool_constant has_return; - typedef BaseMethodInvoker base; + typedef BaseMethodInvoker base; static void Invoke(IDelegate* delegate, Result* result, Args... args) @@ -1010,8 +1010,8 @@ namespace SourceHook */ typedef typename metaprogramming::if_else< std::is_void::value, - detail::VoidMethodInvoker, - detail::ReturningMethodInvoker + detail::VoidMethodInvoker, + detail::ReturningMethodInvoker >::type Invoker; /**