From 4f5fc8f2b3102c6372afdc72af990fcdf9abb7ff Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 17 Mar 2022 20:25:26 +0100
Subject: [PATCH] A few more sonar smells.

---
 include/xbt/automaton.hpp            | 2 +-
 include/xbt/functional.hpp           | 3 +--
 src/include/xbt/parmap.hpp           | 2 +-
 src/kernel/activity/ActivityImpl.hpp | 2 +-
 src/kernel/activity/ExecImpl.hpp     | 2 +-
 src/kernel/actor/ActorImpl.hpp       | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/xbt/automaton.hpp b/include/xbt/automaton.hpp
index 49d55f5492..8c4ac2e9b5 100644
--- a/include/xbt/automaton.hpp
+++ b/include/xbt/automaton.hpp
@@ -23,7 +23,7 @@ template <class F> xbt_automaton_propositional_symbol_t add_proposition(const_xb
 {
   auto* callback = new F(std::move(f));
   return xbt_automaton_propositional_symbol_new_callback(
-      a, id, [](void* cb) -> int { return (*(F*)cb)(); }, callback, [](void* cb) -> void { delete (F*)cb; });
+      a, id, [](auto* cb) -> int { return (*(F*)cb)(); }, callback, [](auto* cb) -> void { delete (F*)cb; });
 }
 
 }
diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index 1bb1e36e5e..9509d49aa8 100644
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -37,11 +37,10 @@ public:
   }
   void operator()() const
   {
-    const int argc                = args_->size();
     std::vector<std::string> args = *args_;
     std::vector<char*> argv(args.size() + 1); // argv[argc] is nullptr
     std::transform(begin(args), end(args), begin(argv), [](std::string& s) { return &s.front(); });
-    code_(argc, argv.data());
+    code_(static_cast<int>(args.size()), argv.data());
   }
 };
 
diff --git a/src/include/xbt/parmap.hpp b/src/include/xbt/parmap.hpp
index 9cebe1d918..48ce17e83c 100644
--- a/src/include/xbt/parmap.hpp
+++ b/src/include/xbt/parmap.hpp
@@ -238,7 +238,7 @@ template <typename T> boost::optional<T> Parmap<T>::next()
  */
 template <typename T> void Parmap<T>::work()
 {
-  unsigned length = common_data->size();
+  unsigned length = static_cast<unsigned>(common_data->size());
   unsigned index  = common_index.fetch_add(1, std::memory_order_relaxed);
   while (index < length) {
     worker_fun((*common_data)[index]);
diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index 5edb48e4ec..68126bca04 100644
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -90,7 +90,7 @@ public:
   // Support for the boost::intrusive_ptr<ActivityImpl> datatype
   friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity);
   friend XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity);
-  int get_refcount() const { return refcount_; } // For debugging purpose
+  int get_refcount() const { return static_cast<int>(refcount_); } // For debugging purpose
 
   static xbt::signal<void(ActivityImpl const&)> on_suspended;
   static xbt::signal<void(ActivityImpl const&)> on_resumed;
diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index f69b6eea78..71331543e5 100644
--- a/src/kernel/activity/ExecImpl.hpp
+++ b/src/kernel/activity/ExecImpl.hpp
@@ -46,7 +46,7 @@ public:
   ExecImpl& set_thread_count(int thread_count);
   ExecImpl& set_hosts(const std::vector<s4u::Host*>& hosts);
 
-  unsigned int get_host_number() const { return hosts_.size(); }
+  unsigned int get_host_number() const { return static_cast<unsigned>(hosts_.size()); }
   double get_seq_remaining_ratio();
   double get_par_remaining_ratio();
   double get_remaining() const override;
diff --git a/src/kernel/actor/ActorImpl.hpp b/src/kernel/actor/ActorImpl.hpp
index 9979c40e24..d822f6df1c 100644
--- a/src/kernel/actor/ActorImpl.hpp
+++ b/src/kernel/actor/ActorImpl.hpp
@@ -114,7 +114,7 @@ private:
   std::atomic_int_fast32_t refcount_{0};
 
 public:
-  int get_refcount() const { return refcount_; }
+  int get_refcount() const { return static_cast<int>(refcount_); }
   friend void intrusive_ptr_add_ref(ActorImpl* actor)
   {
     // This whole memory consistency semantic drives me nuts.
-- 
2.20.1