[Server] Fix GCC 8 build

6 years ago · 9d58b2459d
parent 30eaabb7ce
commit 9d58b2459d
1 changed files with 2 additions and 6 deletions
--- a/apps/openmw-mp/Script/Types.hpp
+++ b/apps/openmw-mp/Script/Types.hpp
@ -103,13 +103,9 @@ struct CallbackIdentity
 struct ScriptFunctionPointer : public ScriptIdentity
 {
    void *addr;
-#if (!defined(__clang__) && defined(__GNUC__))
-    template<typename R, typename... Types>
-    constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(reinterpret_cast<void*>(addr)) {}
-#else
+
    template<typename R, typename... Types>
-    constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(addr) {}
-#endif
+    constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr((void*)(addr)) {}
 };

 struct ScriptFunctionData