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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
ThePhD 2016-07-28 13:33:36 -04:00
commit be946d415c
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sol/stack_get.hpp
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;
} }

7
sol/stack_push.hpp
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&) {