diff --git a/CMakeLists.txt b/CMakeLists.txt index c51779d..4d23747 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,6 +173,11 @@ add_library(commandline_static deps/commandline/src/backends/BufferedBackend.cpp deps/commandline/src/backends/BufferedBackend.h ) + +# Ensure the commandline library uses C++11 +set_target_properties(commandline_static PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED YES) + + if (WIN32) target_compile_definitions(commandline_static PRIVATE -DPLATFORM_WINDOWS=1) else () @@ -215,5 +220,4 @@ if(${PROJECT_NAME}_ENABLE_UNIT_TESTING) if(MSVC) target_link_options(${PROJECT_NAME}-tests PRIVATE "/SUBSYSTEM:CONSOLE") endif(MSVC) -endif() - +endif() \ No newline at end of file diff --git a/src/TLuaEngine.cpp b/src/TLuaEngine.cpp index f990ae8..4493158 100644 --- a/src/TLuaEngine.cpp +++ b/src/TLuaEngine.cpp @@ -268,7 +268,7 @@ std::vector TLuaEngine::StateThreadData::GetStateTableKeys(const st for (size_t i = 0; i < keys.size(); ++i) { auto obj = current.get(keys.at(i)); - if (obj.get_type() == sol::type::nil) { + if (obj.get_type() == sol::type::lua_nil) { // error break; } else if (i == keys.size() - 1) {