From 91bcf1187ed0cb8aa6cf4ca0a4e6ebbf1a0c1895 Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Sun, 12 Nov 2017 04:09:37 -0700 Subject: [PATCH] minor noexcept adjustments --- include/chaiscript/dispatchkit/dispatchkit.hpp | 14 +++++++------- include/chaiscript/dispatchkit/type_info.hpp | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/chaiscript/dispatchkit/dispatchkit.hpp b/include/chaiscript/dispatchkit/dispatchkit.hpp index 5b25127b..4773834f 100644 --- a/include/chaiscript/dispatchkit/dispatchkit.hpp +++ b/include/chaiscript/dispatchkit/dispatchkit.hpp @@ -199,13 +199,13 @@ namespace chaiscript bool has_function(const Proxy_Function &new_f, const std::string_view &name) noexcept { - return std::any_of(m_funcs.begin(), m_funcs.end(), + return std::any_of(m_funcs.begin(), m_funcs.end(), [&](const std::pair &existing_f) { return existing_f.second == name && *(existing_f.first) == *(new_f); } ); } - + private: std::vector> m_typeinfos; @@ -215,14 +215,14 @@ namespace chaiscript std::vector m_conversions; template - static void apply(InItr begin, const InItr end, T &t) + static void apply(InItr begin, const InItr end, T &t) { - for_each(begin, end, + for_each(begin, end, [&t](const auto &obj) { try { t.add(obj.first, obj.second); } catch (const chaiscript::exception::name_conflict_error &) { - /// \todo Should we throw an error if there's a name conflict + /// \todo Should we throw an error if there's a name conflict /// while applying a module? } } @@ -266,7 +266,7 @@ namespace chaiscript namespace detail { /// A Proxy_Function implementation that is able to take - /// a vector of Proxy_Functions and perform a dispatch on them. It is + /// a vector of Proxy_Functions and perform a dispatch on them. It is /// used specifically in the case of dealing with Function object variables class Dispatch_Function final : public dispatch::Proxy_Function_Base { @@ -386,7 +386,7 @@ namespace chaiscript template using SmallVector = std::vector; - + typedef SmallVector> Scope; typedef SmallVector StackData; diff --git a/include/chaiscript/dispatchkit/type_info.hpp b/include/chaiscript/dispatchkit/type_info.hpp index f8fc868d..7683bd1e 100644 --- a/include/chaiscript/dispatchkit/type_info.hpp +++ b/include/chaiscript/dispatchkit/type_info.hpp @@ -34,7 +34,7 @@ namespace chaiscript { public: constexpr Type_Info(const bool t_is_const, const bool t_is_reference, const bool t_is_pointer, const bool t_is_void, - const bool t_is_arithmetic, const std::type_info *t_ti, const std::type_info *t_bare_ti) + const bool t_is_arithmetic, const std::type_info *t_ti, const std::type_info *t_bare_ti) noexcept : m_type_info(t_ti), m_bare_type_info(t_bare_ti), m_flags((static_cast(t_is_const) << is_const_flag) + (static_cast(t_is_reference) << is_reference_flag) @@ -44,7 +44,7 @@ namespace chaiscript { } - constexpr Type_Info() = default; + constexpr Type_Info() noexcept = default; constexpr bool operator<(const Type_Info &ti) const noexcept {