From b35800059e68e39f3928e7db61c44b4573747689 Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Wed, 13 Jul 2022 20:27:27 +0300 Subject: [PATCH] Migrate to C++17. Update sol2 to 3.3.0. --- src/extractor/scripting_environment_lua.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/extractor/scripting_environment_lua.cpp b/src/extractor/scripting_environment_lua.cpp index 565e209bd..baef341cb 100644 --- a/src/extractor/scripting_environment_lua.cpp +++ b/src/extractor/scripting_environment_lua.cpp @@ -945,10 +945,10 @@ Sol2ScriptingEnvironment::GetStringListFromTable(const std::string &table_name) auto &context = GetSol2Context(); BOOST_ASSERT(context.state.lua_state() != nullptr); std::vector strings; - sol::table table = context.profile_table[table_name]; - if (table.valid()) + sol::optional table = context.profile_table[table_name]; + if (table && table->valid()) { - for (auto &&pair : table) + for (auto &&pair : *table) { strings.push_back(pair.second.as()); } @@ -963,13 +963,13 @@ Sol2ScriptingEnvironment::GetStringListsFromTable(const std::string &table_name) auto &context = GetSol2Context(); BOOST_ASSERT(context.state.lua_state() != nullptr); - sol::table table = context.profile_table[table_name]; - if (!table.valid()) + sol::optional table = context.profile_table[table_name]; + if (!table || !table->valid()) { return string_lists; } - for (const auto &pair : table) + for (const auto &pair : *table) { sol::table inner_table = pair.second; if (!inner_table.valid())