Make member variables "private" (Sonar).

diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp
index 3b40ae7..28ce469 100644 (file)
--- a/include/simgrid/s4u/Host.hpp
+++ b/include/simgrid/s4u/Host.hpp
@@ -51,6 +51,11 @@ class XBT_PUBLIC Host : public xbt::Extendable<Host> {
   friend kernel::resource::CpuAction; // signal exec_state_changed
 #endif
 
+  static xbt::signal<void(Host&)> on_creation;
+  static xbt::signal<void(Host const&)> on_destruction;
+  xbt::signal<void(Host const&)> on_this_destruction;
+  static xbt::signal<void(kernel::resource::CpuAction&, kernel::resource::Action::State)> on_exec_state_change;
+
 public:
   explicit Host(kernel::resource::HostImpl* pimpl) : pimpl_(pimpl) {}
 
@@ -58,11 +63,6 @@ protected:
   virtual ~Host(); // Call destroy() instead of manually deleting it.
   Host* set_netpoint(kernel::routing::NetPoint* netpoint);
 
-  static xbt::signal<void(Host&)> on_creation;
-  static xbt::signal<void(Host const&)> on_destruction;
-  xbt::signal<void(Host const&)> on_this_destruction;
-  static xbt::signal<void(kernel::resource::CpuAction&, kernel::resource::Action::State)> on_exec_state_change;
-
 public:
   static xbt::signal<void(Host const&)> on_speed_change;
   xbt::signal<void(Host const&)> on_this_speed_change;

diff --git a/include/simgrid/s4u/Task.hpp b/include/simgrid/s4u/Task.hpp
index c0677da..c776b89 100644 (file)
--- a/include/simgrid/s4u/Task.hpp
+++ b/include/simgrid/s4u/Task.hpp
@@ -45,6 +45,11 @@ class Task {
   ActivityPtr previous_activity_;
   ActivityPtr current_activity_;
 
+  inline static xbt::signal<void(Task*)> on_start;
+  xbt::signal<void(Task*)> on_this_start;
+  inline static xbt::signal<void(Task*)> on_completion;
+  xbt::signal<void(Task*)> on_this_completion;
+
 protected:
   explicit Task(const std::string& name);
   virtual ~Task()     = default;
@@ -54,11 +59,6 @@ protected:
 
   void set_current_activity (ActivityPtr a) { current_activity_ = a; }
 
-  inline static xbt::signal<void(Task*)> on_start;
-  xbt::signal<void(Task*)> on_this_start;
-  inline static xbt::signal<void(Task*)> on_completion;
-  xbt::signal<void(Task*)> on_this_completion;
-
 public:
   const std::string& get_name() const { return name_; }
   const char* get_cname() const { return name_.c_str(); }