From 64785dca1788edb12869510d7c8b0ec488193505 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 4 Oct 2016 17:08:45 +0200 Subject: [PATCH] Lua/LuaInstance: Fix move constructor/operator Former-commit-id: 172608ac5683f594243248017e3abf7f0e2066c9 [formerly d5deec47e4ab121f61ffe7aaea5aa6a7f6774c9e] [formerly 52e490fac2b7003bf64b4eac0cf7e36ce4da46e5 [formerly b64145eecf4cb5c2db1e0e2e780440af8bcb05e7]] Former-commit-id: ad3eec1403fdec906a6495c675dee0407cb75d9b [formerly 3f76ca985a58fcf13c248d438538139e843d05f7] Former-commit-id: 3789b4eb068b2fece669f3a5804d0015ba2e806f --- include/Nazara/Lua/LuaInstance.inl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/Nazara/Lua/LuaInstance.inl b/include/Nazara/Lua/LuaInstance.inl index e6a4b5482..c5cdc3b6b 100644 --- a/include/Nazara/Lua/LuaInstance.inl +++ b/include/Nazara/Lua/LuaInstance.inl @@ -16,11 +16,11 @@ namespace Nz inline LuaInstance::LuaInstance(LuaInstance&& instance) noexcept : m_memoryLimit(instance.m_memoryLimit), m_memoryUsage(instance.m_memoryUsage), - m_timeLimit(m_timeLimit), - m_clock(std::move(m_clock)), - m_lastError(std::move(m_lastError)), - m_state(m_state), - m_level(m_level) + m_timeLimit(instance.m_timeLimit), + m_clock(std::move(instance.m_clock)), + m_lastError(std::move(instance.m_lastError)), + m_state(instance.m_state), + m_level(instance.m_level) { instance.m_state = nullptr; } @@ -52,13 +52,13 @@ namespace Nz inline LuaInstance& LuaInstance::operator=(LuaInstance&& instance) noexcept { - m_clock = std::move(m_clock); - m_lastError = std::move(m_lastError); - m_level = m_level; + m_clock = std::move(instance.m_clock); + m_lastError = std::move(instance.m_lastError); + m_level = instance.m_level; m_memoryLimit = instance.m_memoryLimit; m_memoryUsage = instance.m_memoryUsage; - m_state = m_state; - m_timeLimit = m_timeLimit; + m_state = instance.m_state; + m_timeLimit = instance.m_timeLimit; instance.m_state = nullptr;