From aaffcba79be9dfab28aca23dccf5e0085c401bbb Mon Sep 17 00:00:00 2001 From: Phoenix / Hotaru Date: Mon, 10 Jul 2023 10:27:42 +0100 Subject: [PATCH] Fix ScriptFunctionPointer --- apps/openmw-mp/Script/Types.hpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/openmw-mp/Script/Types.hpp b/apps/openmw-mp/Script/Types.hpp index 88590d61d..3a12e99a4 100644 --- a/apps/openmw-mp/Script/Types.hpp +++ b/apps/openmw-mp/Script/Types.hpp @@ -99,13 +99,9 @@ struct CallbackIdentity struct ScriptFunctionPointer : public ScriptIdentity { void *addr; -#if (!defined(__clang__) && defined(__GNUC__)) + template - constexpr ScriptFunctionPointer(Function addr) : ScriptIdentity(addr), addr((void*)(addr)) {} -#else - template - constexpr ScriptFunctionPointer(Function addr) : ScriptIdentity(addr), addr(addr) {} -#endif + constexpr ScriptFunctionPointer(Function addr) : ScriptIdentity(addr), addr(reinterpret_cast(reinterpret_cast(addr))) {} }; struct ScriptFunctionData