StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

GCC is retarded. Well, mostly retarded, anyhow...

Browse Source
This commit is contained in:
ThePhD 2013-12-08 23:51:18 -05:00
parent 288fd1319c
commit a66ceb92f7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sol/table.hpp
View File

@ -27,7 +27,7 @@
#include <unordered_map> #include <unordered_map>
#include <array> #include <array>
#include <memory> #include <memory>
#include <cstring>
namespace sol { namespace sol {
namespace detail { namespace detail {
@ -121,10 +121,10 @@ private:
return set_fx(std::true_type(), std::forward<T>(key), std::forward<TFx>(fx), std::forward<TObj>(obj)); return set_fx(std::true_type(), std::forward<T>(key), std::forward<TFx>(fx), std::forward<TObj>(obj));
} }
template<typename T, typename TFx, typename TM> template<typename T, typename TFx, typename TObj>
table& set_lvalue_fx(std::false_type, T&& key, TFx&& fx, TM& mem) { table& set_lvalue_fx(std::false_type, T&& key, TFx&& fx, TObj&& obj) {
typedef typename std::remove_pointer<typename std::decay<TFx>::type>::type clean_fx; typedef typename std::remove_pointer<typename std::decay<TFx>::type>::type clean_fx;
std::unique_ptr<lua_func> sptr(new explicit_lua_func<clean_fx, TM>(mem, std::forward<TFx>(fx))); std::unique_ptr<lua_func> sptr(new explicit_lua_func<clean_fx, TObj>(std::forward<TObj>( obj ), std::forward<TFx>(fx)));
return set_fx(std::forward<T>(key), std::move(sptr)); return set_fx(std::forward<T>(key), std::move(sptr));
} }
@ -170,17 +170,17 @@ private:
typedef typename std::decay<TFx>::type ptr_fx; typedef typename std::decay<TFx>::type ptr_fx;
std::string fkey(key); std::string fkey(key);
ptr_fx target(std::forward<TFx>(fx)); ptr_fx target(std::forward<TFx>(fx));
void* userdata = static_cast<void*>(target); void* userdata = reinterpret_cast<void*>(target);
lua_CFunction freefunc = &static_lua_func<TFx>::call; lua_CFunction freefunc = &static_lua_func<TFx>::call;
const char* freefuncname = fkey.c_str(); const char* freefuncname = fkey.c_str();
const luaL_Reg funcreg[ 2 ] = { const luaL_Reg funcreg[ 2 ] = {
{ freefuncname, freefunc }, { freefuncname, freefunc },
{ } { nullptr, nullptr }
}; };
push(); push();
stack::push(state(), target); stack::push(state(), userdata);
luaL_setfuncs(state(), funcreg, 1); luaL_setfuncs(state(), funcreg, 1);
lua_pop(state(), 1); lua_pop(state(), 1);
@ -199,12 +199,12 @@ private:
hint->second.reset(luafunc.release()); hint->second.reset(luafunc.release());
} }
lua_func* target = hint->second.get(); lua_func* target = hint->second.get();
void* userdata = static_cast<void*>(target); void* userdata = reinterpret_cast<void*>(target);
lua_CFunction freefunc = &lua_func::call; lua_CFunction freefunc = &lua_func::call;
const char* freefuncname = hint->first.c_str(); const char* freefuncname = hint->first.c_str();
const luaL_Reg funcreg[ 2 ] = { const luaL_Reg funcreg[ 2 ] = {
{ freefuncname, freefunc }, { freefuncname, freefunc },
{ } { nullptr, nullptr }
}; };
push(); push();