Merge pull request #150 from THE-FYP/develop

fix std::nullptr_t getter and pusher
This commit is contained in:
The Phantom Derpstorm 2016-07-25 17:52:15 -04:00 committed by GitHub
commit c0d840d3c0
2 changed files with 8 additions and 1 deletions

View File

@ -227,7 +227,7 @@ namespace sol {
}; };
template<> template<>
struct pusher<std::nullptr_t> { struct getter<std::nullptr_t> {
static std::nullptr_t get(lua_State*, int = -1) { static std::nullptr_t get(lua_State*, int = -1) {
return nullptr; return nullptr;
} }

View File

@ -527,6 +527,13 @@ namespace sol {
} }
}; };
template<>
struct pusher<std::nullptr_t> {
static int push(lua_State* L, std::nullptr_t) {
return stack::push(L, nil);
}
};
template<> template<>
struct pusher<this_state> { struct pusher<this_state> {
static int push(lua_State*, const this_state&) { static int push(lua_State*, const this_state&) {