diff options
| author | Orivej Desh <orivej@gmx.fr> | 2020-05-22 09:13:23 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2020-05-22 09:13:23 +0000 |
| commit | 16d7f7edae6847e7a792d79b533b245f71907f46 (patch) | |
| tree | a304b937bc072e96e2745ede17c7e6b9b4495bee /pkgs/games/openmw/tes3mp.patch | |
| parent | eae4f22176789ce3b6a66bad773a45b12e895cdf (diff) | |
| parent | 5de1e307f29ab91baeb43ab2a58ed13a944e40ea (diff) | |
| download | nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.gz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.bz2 nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.lz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.xz nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.tar.zst nixlib-16d7f7edae6847e7a792d79b533b245f71907f46.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/games/openmw/tes3mp.patch')
| -rw-r--r-- | pkgs/games/openmw/tes3mp.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/games/openmw/tes3mp.patch b/pkgs/games/openmw/tes3mp.patch new file mode 100644 index 000000000000..c2a78f9db9b0 --- /dev/null +++ b/pkgs/games/openmw/tes3mp.patch @@ -0,0 +1,13 @@ +diff --git a/apps/openmw-mp/Script/Types.hpp b/apps/openmw-mp/Script/Types.hpp +index be365cfb8..204dcdc7b 100644 +--- a/apps/openmw-mp/Script/Types.hpp ++++ b/apps/openmw-mp/Script/Types.hpp +@@ -105,7 +105,7 @@ 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((void*)(addr)) {} ++ constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(addr) {} + #else + template<typename R, typename... Types> + constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(addr) {} |