From e8e47173fb776f598088480bb579462bfdb7a87b Mon Sep 17 00:00:00 2001 From: Bernd Amend Date: Sat, 22 May 2021 14:21:32 +0200 Subject: [PATCH] fix a couple of g++s -Wnoexcept warnings --- include/chaiscript/language/chaiscript_engine.hpp | 2 +- unittests/compiled_tests.cpp | 2 +- unittests/multifile_test_module.cpp | 4 +--- unittests/multifile_test_module.hpp | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/chaiscript/language/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp index 4d410314..6fc74334 100644 --- a/include/chaiscript/language/chaiscript_engine.hpp +++ b/include/chaiscript/language/chaiscript_engine.hpp @@ -201,7 +201,7 @@ namespace chaiscript m_engine.add(fun([this](const Boxed_Value &t_bv, const std::string &t_name){ set_global(t_bv, t_name); }), "set_global"); // why this unused parameter to Namespace? - m_engine.add(fun([this](const std::string& t_namespace_name) { register_namespace([](Namespace& /*space*/) {}, t_namespace_name); import(t_namespace_name); }), "namespace"); + m_engine.add(fun([this](const std::string& t_namespace_name) { register_namespace([] (Namespace& /*space*/) noexcept {}, t_namespace_name); import(t_namespace_name); }), "namespace"); m_engine.add(fun([this](const std::string& t_namespace_name) { import(t_namespace_name); }), "import"); } diff --git a/unittests/compiled_tests.cpp b/unittests/compiled_tests.cpp index 5dc287f0..99874aca 100644 --- a/unittests/compiled_tests.cpp +++ b/unittests/compiled_tests.cpp @@ -795,7 +795,7 @@ struct Object_Lifetime_Vector2 { Object_Lifetime_Vector2() : x(0), y(0) {} Object_Lifetime_Vector2(T px, T py) : x(px), y(py) {} - Object_Lifetime_Vector2(const Object_Lifetime_Vector2& cp) : x(cp.x), y(cp.y) {} + Object_Lifetime_Vector2(const Object_Lifetime_Vector2& cp) noexcept : x(cp.x), y(cp.y) {} Object_Lifetime_Vector2& operator+=(const Object_Lifetime_Vector2& vec_r) { diff --git a/unittests/multifile_test_module.cpp b/unittests/multifile_test_module.cpp index ec1df238..d2c56e52 100644 --- a/unittests/multifile_test_module.cpp +++ b/unittests/multifile_test_module.cpp @@ -2,9 +2,7 @@ #include "multifile_test_module.hpp" -Multi_Test_Module::Multi_Test_Module() -{ -} +Multi_Test_Module::Multi_Test_Module() noexcept = default; int Multi_Test_Module::get_module_value() { diff --git a/unittests/multifile_test_module.hpp b/unittests/multifile_test_module.hpp index b09dca39..cb0db04e 100644 --- a/unittests/multifile_test_module.hpp +++ b/unittests/multifile_test_module.hpp @@ -5,7 +5,7 @@ class Multi_Test_Module public: static int get_module_value(); - Multi_Test_Module(); + Multi_Test_Module() noexcept; chaiscript::ModulePtr get_module(); };