Merge branch 'master' into CRTP

[simgrid.git] / include / simgrid / s4u / Exec.hpp

diff --git a/include/simgrid/s4u/Exec.hpp b/include/simgrid/s4u/Exec.hpp
index 989aa69..1e9de25 100644 (file)
--- a/include/simgrid/s4u/Exec.hpp
+++ b/include/simgrid/s4u/Exec.hpp
@@ -21,12 +21,10 @@ namespace s4u {
  * They are generated from this_actor::exec_init() or Host::execute(), and can be used to model pools of threads or
  * similar mechanisms.
  */
  * They are generated from this_actor::exec_init() or Host::execute(), and can be used to model pools of threads or
  * similar mechanisms.
  */

-class XBT_PUBLIC Exec : public Activity {
-  std::string name_             = "";
+class XBT_PUBLIC Exec : public Activity_T<Exec> {

   double priority_              = 1.0;
   double bound_                 = 0.0;
   double timeout_               = 0.0;
   double priority_              = 1.0;
   double bound_                 = 0.0;
   double timeout_               = 0.0;

-  std::string tracing_category_ = "";

   std::atomic_int_fast32_t refcount_{0};
 
 protected:
   std::atomic_int_fast32_t refcount_{0};
 
 protected:


@@ -61,9 +59,7 @@ public:
   bool test() override;
 
   ExecPtr set_bound(double bound);
   bool test() override;
 
   ExecPtr set_bound(double bound);

-  ExecPtr set_name(const std::string& name);

   ExecPtr set_priority(double priority);
   ExecPtr set_priority(double priority);

-  ExecPtr set_tracing_category(const std::string& category);

   ExecPtr set_timeout(double timeout);
   Exec* cancel() override;
   const std::string& get_name() const { return name_; }
   ExecPtr set_timeout(double timeout);
   Exec* cancel() override;
   const std::string& get_name() const { return name_; }