sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into physics3d-material

This commit is contained in:
Lynix 2017-12-16 21:21:44 +01:00
parent 36c1e4e8cb ec22b8d643
commit 9b431e54c9
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Nazara/Lua/LuaInstance.cpp
View File

@ -39,14 +39,19 @@ namespace Nz
} }
LuaInstance::LuaInstance(LuaInstance&& instance) : LuaInstance::LuaInstance(LuaInstance&& instance) :
LuaState(std::move(instance)), LuaState(std::move(instance))
m_memoryLimit(std::move(m_memoryLimit)),
m_memoryUsage(std::move(m_memoryUsage)),
m_timeLimit(std::move(m_timeLimit)),
m_clock(std::move(m_clock)),
m_level(std::move(m_level))
{ {
lua_setallocf(m_state, MemoryAllocator, this); std::swap(m_memoryLimit, instance.m_memoryLimit);
std::swap(m_memoryUsage, instance.m_memoryUsage);
std::swap(m_timeLimit, instance.m_timeLimit);
std::swap(m_clock, instance.m_clock);
std::swap(m_level, instance.m_level);
if (m_state)
lua_setallocf(m_state, MemoryAllocator, this);
if (instance.m_state)
lua_setallocf(instance.m_state, MemoryAllocator, &instance);
} }
LuaInstance::~LuaInstance() LuaInstance::~LuaInstance()
@ -59,13 +64,17 @@ namespace Nz
{ {
LuaState::operator=(std::move(instance)); LuaState::operator=(std::move(instance));
m_memoryLimit = std::move(instance.m_memoryLimit); std::swap(m_memoryLimit, instance.m_memoryLimit);
m_memoryUsage = std::move(instance.m_memoryUsage); std::swap(m_memoryUsage, instance.m_memoryUsage);
m_timeLimit = std::move(instance.m_timeLimit); std::swap(m_timeLimit, instance.m_timeLimit);
m_clock = std::move(instance.m_clock); std::swap(m_clock, instance.m_clock);
m_level = std::move(instance.m_level); std::swap(m_level, instance.m_level);
lua_setallocf(m_state, MemoryAllocator, this); if (m_state)
lua_setallocf(m_state, MemoryAllocator, this);
if (instance.m_state)
lua_setallocf(instance.m_state, MemoryAllocator, &instance);
return *this; return *this;
} }