mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-12 17:51:28 +00:00
Applied changes proposed in https://github.com/decimad/luabind-deboostified/pull/38/
These changes claim to fix GCC 7 compilation.
This commit is contained in:
parent
5f23a72a16
commit
f6c8d9532e
@ -39,6 +39,7 @@ namespace luabind {
|
|||||||
|
|
||||||
template< typename T >
|
template< typename T >
|
||||||
struct is_function< std::function< T > > : public std::true_type {};
|
struct is_function< std::function< T > > : public std::true_type {};
|
||||||
|
}
|
||||||
|
|
||||||
template< typename R, typename... Args, typename WrappedType >
|
template< typename R, typename... Args, typename WrappedType >
|
||||||
struct deduce_signature <std::function< R(Args...) >, WrappedType >
|
struct deduce_signature <std::function< R(Args...) >, WrappedType >
|
||||||
@ -46,9 +47,6 @@ namespace luabind {
|
|||||||
using type = meta::type_list< R, Args... >;
|
using type = meta::type_list< R, Args... >;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
template <typename F>
|
template <typename F>
|
||||||
struct default_converter<F, typename std::enable_if<detail::is_function<remove_const_reference_t<F>>::value>::type>
|
struct default_converter<F, typename std::enable_if<detail::is_function<remove_const_reference_t<F>>::value>::type>
|
||||||
{
|
{
|
||||||
|
|||||||
@ -26,6 +26,7 @@
|
|||||||
|
|
||||||
#include <luabind/config.hpp>
|
#include <luabind/config.hpp>
|
||||||
#include <luabind/detail/policy.hpp>
|
#include <luabind/detail/policy.hpp>
|
||||||
|
#include <luabind/detail/type_traits.hpp>
|
||||||
|
|
||||||
namespace luabind {
|
namespace luabind {
|
||||||
|
|
||||||
|
|||||||
@ -72,7 +72,7 @@ namespace luabind {
|
|||||||
detail::stack_pop pop(m_interpreter, 1);
|
detail::stack_pop pop(m_interpreter, 1);
|
||||||
|
|
||||||
lua_pushvalue(m_interpreter, m_key_index);
|
lua_pushvalue(m_interpreter, m_key_index);
|
||||||
detail::push(m_interpreter, value);
|
detail::push_to_lua(m_interpreter, value);
|
||||||
lua_settable(m_interpreter, -3);
|
lua_settable(m_interpreter, -3);
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user