Use std::string for xbt_parse_units.

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

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index 4ba5273..08745c0 100644 (file)
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -46,8 +46,8 @@ public:
   const std::string& get_name() const { return name_; }
   const char* get_cname() const { return name_.c_str(); }
 
-  bool test();
-  void wait_for(actor::ActorImpl* issuer, double timeout);
+  virtual bool test();
+  virtual void wait_for(actor::ActorImpl* issuer, double timeout);
   virtual ActivityImpl& set_timeout(double) { THROW_UNIMPLEMENTED; }
 
   virtual void suspend();
@@ -59,7 +59,8 @@ public:
   virtual void finish() = 0; // Unlock all simcalls blocked on that activity, either because it was marked as done by
                              // the model or because it terminated without waiting for the model
 
-  virtual void register_simcall(smx_simcall_t simcall);
+  void register_simcall(smx_simcall_t simcall);
+  void unregister_simcall(smx_simcall_t simcall);
   void clean_action();
   virtual double get_remaining() const;
   const char* get_state_str() const;