From e62f0d3296fd8ae62160e75ee143e59636d68fda Mon Sep 17 00:00:00 2001 From: Bernd Amend Date: Sat, 22 May 2021 13:50:57 +0200 Subject: [PATCH] drop useless statics and/or add [[nodiscard]] --- include/chaiscript/chaiscript_defines.hpp | 2 +- include/chaiscript/dispatchkit/function_params.hpp | 5 +---- include/chaiscript/language/chaiscript_eval.hpp | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/chaiscript/chaiscript_defines.hpp b/include/chaiscript/chaiscript_defines.hpp index 30b8ce18..b2ec5efb 100644 --- a/include/chaiscript/chaiscript_defines.hpp +++ b/include/chaiscript/chaiscript_defines.hpp @@ -281,7 +281,7 @@ namespace chaiscript { - static inline std::vector default_options() + [[nodiscard]] inline std::vector default_options() { #ifdef CHAISCRIPT_NO_DYNLOAD return {Options::No_Load_Modules, Options::External_Scripts}; diff --git a/include/chaiscript/dispatchkit/function_params.hpp b/include/chaiscript/dispatchkit/function_params.hpp index 1430becc..7de50249 100644 --- a/include/chaiscript/dispatchkit/function_params.hpp +++ b/include/chaiscript/dispatchkit/function_params.hpp @@ -60,7 +60,7 @@ namespace chaiscript { return m_end - m_begin; } - std::vector to_vector() const { + [[nodiscard]] std::vector to_vector() const { return std::vector{m_begin, m_end}; } @@ -71,7 +71,6 @@ namespace chaiscript { private: const Boxed_Value *m_begin = nullptr; const Boxed_Value *m_end = nullptr; - }; // Constructor specialization for array of size 0 @@ -83,6 +82,4 @@ namespace chaiscript { } - #endif - diff --git a/include/chaiscript/language/chaiscript_eval.hpp b/include/chaiscript/language/chaiscript_eval.hpp index d38e5aa3..32e6ae5e 100644 --- a/include/chaiscript/language/chaiscript_eval.hpp +++ b/include/chaiscript/language/chaiscript_eval.hpp @@ -51,7 +51,7 @@ namespace chaiscript { /// Helper function that will set up the scope around a function call, including handling the named function parameters template - static Boxed_Value eval_function(chaiscript::detail::Dispatch_Engine &t_ss, const AST_Node_Impl &t_node, const std::vector &t_param_names, const Function_Params &t_vals, const std::map *t_locals=nullptr, bool has_this_capture = false) { + Boxed_Value eval_function(chaiscript::detail::Dispatch_Engine &t_ss, const AST_Node_Impl &t_node, const std::vector &t_param_names, const Function_Params &t_vals, const std::map *t_locals=nullptr, bool has_this_capture = false) { chaiscript::detail::Dispatch_State state(t_ss); const Boxed_Value *thisobj = [&]() -> const Boxed_Value *{