Fix mailbox::clear() to properly finish Comms

[simgrid.git] / src / kernel / activity / ActivityImpl.hpp

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index 5a5404e487b1bc5c97cd9b4eaf90eb30bc1b40b5..68defdbbb9f48756db7ee40b6df83f754d10018f 100644 (file)
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -6,8 +6,9 @@
 #ifndef SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP
 #define SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP
 
-#include <string>
 #include <list>
+#include <string>
+#include <string_view>
 
 #include "simgrid/forward.h"
 #include <xbt/utility.hpp>
@@ -16,9 +17,7 @@
 #include <simgrid/kernel/resource/Action.hpp>
 #include <simgrid/simix.hpp>
 
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
 
 XBT_DECLARE_ENUM_CLASS(State, WAITING, READY, RUNNING, DONE, CANCELED, FAILED, SRC_HOST_FAILURE, DST_HOST_FAILURE,
                        TIMEOUT, SRC_TIMEOUT, DST_TIMEOUT, LINK_FAILURE);
@@ -39,7 +38,7 @@ public:
   resource::Action* surf_action_ = nullptr;
 
 protected:
-  void inline set_name(const std::string& name)
+  void inline set_name(std::string_view name)
   {
     // This is to keep name_ private while allowing ActivityImpl_T<??> to set it and then return a Ptr to qualified
     // child type
@@ -100,13 +99,13 @@ template <class AnyActivityImpl> class ActivityImpl_T : public ActivityImpl {
   std::string tracing_category_ = "";
 
 public:
-  AnyActivityImpl& set_name(const std::string& name) /* Hides the function in the ancestor class */
+  AnyActivityImpl& set_name(std::string_view name) /* Hides the function in the ancestor class */
   {
     ActivityImpl::set_name(name);
     return static_cast<AnyActivityImpl&>(*this);
   }
 
-  AnyActivityImpl& set_tracing_category(const std::string& category)
+  AnyActivityImpl& set_tracing_category(std::string_view category)
   {
     tracing_category_ = category;
     return static_cast<AnyActivityImpl&>(*this);
@@ -114,8 +113,6 @@ public:
   const std::string& get_tracing_category() const { return tracing_category_; }
 };
 
-} // namespace activity
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::activity
 
 #endif /* SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP */