From 1ff76126787bd490c02f88480e50627b8c43964f Mon Sep 17 00:00:00 2001 From: Bruno Donassolo Date: Tue, 5 Apr 2022 11:16:16 +0200 Subject: [PATCH] Sonar smells --- include/simgrid/kernel/routing/NetZoneImpl.hpp | 2 +- src/kernel/resource/StandardLinkImpl.cpp | 2 +- src/kernel/resource/StandardLinkImpl.hpp | 2 +- src/kernel/routing/NetZoneImpl.cpp | 4 ++-- src/s4u/s4u_Engine.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/simgrid/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp index 97563dabbb..72a09c68e8 100644 --- a/include/simgrid/kernel/routing/NetZoneImpl.hpp +++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp @@ -81,7 +81,7 @@ class XBT_PUBLIC NetZoneImpl : public xbt::PropertyHolder { // this hpp is exported to the users and so cannot include the other internal hpp. class LinkDeleter { public: - void operator()(resource::StandardLinkImpl* link); + void operator()(resource::StandardLinkImpl* link) const; }; std::map, std::less<>> links_; /* save split-duplex links separately, keep links_ with only LinkImpl* seen by the user diff --git a/src/kernel/resource/StandardLinkImpl.cpp b/src/kernel/resource/StandardLinkImpl.cpp index cf3dfbbdd2..92e4291cde 100644 --- a/src/kernel/resource/StandardLinkImpl.cpp +++ b/src/kernel/resource/StandardLinkImpl.cpp @@ -27,7 +27,7 @@ StandardLinkImpl::StandardLinkImpl(const std::string& name) : LinkImpl(name), pi XBT_DEBUG("Create link '%s'", name.c_str()); } -void StandardLinkImpl::Deleter::operator()(resource::StandardLinkImpl* link) +void StandardLinkImpl::Deleter::operator()(resource::StandardLinkImpl* link) const { link->destroy(); } diff --git a/src/kernel/resource/StandardLinkImpl.hpp b/src/kernel/resource/StandardLinkImpl.hpp index 818df95e3d..1b06a36973 100644 --- a/src/kernel/resource/StandardLinkImpl.hpp +++ b/src/kernel/resource/StandardLinkImpl.hpp @@ -36,7 +36,7 @@ public: void destroy(); // Must be called instead of the destructor class Deleter { public: - void operator()(StandardLinkImpl* link); + void operator()(StandardLinkImpl* link) const; }; void latency_check(double latency) const; diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index 917f96bc32..a63f8a47c1 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -71,7 +71,7 @@ xbt::signal const& link_list)> NetZoneImpl::on_route_creation; -void NetZoneImpl::LinkDeleter::operator()(resource::StandardLinkImpl* link) +void NetZoneImpl::LinkDeleter::operator()(resource::StandardLinkImpl* link) const { link->destroy(); } @@ -160,7 +160,7 @@ std::vector NetZoneImpl::get_filtered_links(const std::function NetZoneImpl::get_all_links() const { - return get_filtered_links([](s4u::Link*) { return true; }); + return get_filtered_links([](const s4u::Link*) { return true; }); } size_t NetZoneImpl::get_link_count() const diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index 7b529b4f8b..c5a656a64b 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -298,7 +298,7 @@ size_t Engine::get_link_count() const /** @brief Returns the list of all links found in the platform */ std::vector Engine::get_all_links() const { - return get_filtered_links([](Link*) { return true; }); + return get_filtered_links([](const Link*) { return true; }); } std::vector Engine::get_filtered_links(const std::function& filter) const -- 2.20.1