summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/sol2/sol/stack_core.hpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2017-02-05 16:01:50 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2017-02-05 16:06:06 +0100
commitac096aa2a0921efde96b76252dffb119dcf27efc (patch)
tree2ad9a28a7f6babce8cfcbf5995e3e055ff13ff60 /3rdparty/sol2/sol/stack_core.hpp
parent29df715138452ee18ba19ec4b07e18c4b3185de7 (diff)
Update sol2 (nw)
Diffstat (limited to '3rdparty/sol2/sol/stack_core.hpp')
-rw-r--r--3rdparty/sol2/sol/stack_core.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/3rdparty/sol2/sol/stack_core.hpp b/3rdparty/sol2/sol/stack_core.hpp
index 910399f3793..2675e02e50b 100644
--- a/3rdparty/sol2/sol/stack_core.hpp
+++ b/3rdparty/sol2/sol/stack_core.hpp
@@ -62,7 +62,7 @@ namespace sol {
template <typename T>
inline int user_alloc_destroy(lua_State* L) {
- void* rawdata = lua_touserdata(L, upvalue_index(1));
+ void* rawdata = lua_touserdata(L, 1);
T* data = static_cast<T*>(rawdata);
std::allocator<T> alloc;
alloc.destroy(data);
@@ -258,7 +258,7 @@ namespace sol {
template <typename T>
inline auto tagged_get(types<T>, lua_State* L, int index, record& tracking) -> decltype(stack_detail::unchecked_get<T>(L, index, tracking)) {
auto op = check_get<T>(L, index, type_panic, tracking);
- return *op;
+ return *std::move(op);
}
#else
template <typename T>