From 5f59d008be4acefd8ce5f46dff421de538688c6d Mon Sep 17 00:00:00 2001 From: mihacooper Date: Fri, 20 Jan 2017 14:16:29 +0300 Subject: [PATCH] fixes of review comments --- src/lua-module.cpp | 7 +------ src/shared-table.cpp | 2 +- src/threading.cpp | 9 ++------- src/threading.h | 9 +++++---- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/lua-module.cpp b/src/lua-module.cpp index 933e411..5d2219c 100644 --- a/src/lua-module.cpp +++ b/src/lua-module.cpp @@ -1,9 +1,4 @@ -extern "C" -{ -#include "lua.h" -#include "lauxlib.h" -#include "lualib.h" -} +#include "lua.hpp" #include "threading.h" #include "shared-table.h" diff --git a/src/shared-table.cpp b/src/shared-table.cpp index dd85ad3..d84c812 100644 --- a/src/shared-table.cpp +++ b/src/shared-table.cpp @@ -69,4 +69,4 @@ TablePool& defaultPool() noexcept { return pool; } -} // core +} // share_data diff --git a/src/threading.cpp b/src/threading.cpp index 0d91846..f7f0962 100644 --- a/src/threading.cpp +++ b/src/threading.cpp @@ -18,19 +18,14 @@ LuaThread::LuaThread(const sol::function& function, const sol::variadic_args& ar share_data::SharedTable::get_user_type(*p_state_); // 3. Save parameters - validate_args(args); + store_args(args); // 4. Run thread p_thread_.reset(new std::thread(&LuaThread::work, this)); assert(p_thread_.get() != NULL); } -LuaThread::~LuaThread() -{ - join(); -} - -void LuaThread::validate_args(const sol::variadic_args& args) noexcept +void LuaThread::store_args(const sol::variadic_args& args) noexcept { const auto end = --args.end(); for(auto iter = args.begin(); iter != end; iter++) diff --git a/src/threading.h b/src/threading.h index 54df6cc..d5a0be1 100644 --- a/src/threading.h +++ b/src/threading.h @@ -1,19 +1,20 @@ #pragma once +#include "shared-table.h" + #include + #include #include #include -#include "shared-table.h" - namespace threading { class LuaThread { public: LuaThread(const sol::function& function, const sol::variadic_args& args) noexcept; - virtual ~LuaThread() noexcept; + virtual ~LuaThread() noexcept = default; void join() noexcept; static std::string thread_id() noexcept; @@ -21,7 +22,7 @@ public: private: void work() noexcept; - void validate_args(const sol::variadic_args& args) noexcept; + void store_args(const sol::variadic_args& args) noexcept; std::string str_function_; std::shared_ptr p_state_;