X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba7b1790f5e9e792906df0ff12aeb5aababef824..6bc18b576fa4a890d8b9916d292ca67dfbf60dd3:/include/simgrid/s4u/Activity.hpp diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp index 4db481e1cb..6cd6276393 100644 --- a/include/simgrid/s4u/Activity.hpp +++ b/include/simgrid/s4u/Activity.hpp @@ -27,12 +27,17 @@ namespace s4u { * - Synchronization activities may possibly be connected to no action. */ class XBT_PUBLIC Activity { +#ifndef DOXYGEN friend Comm; friend XBT_PUBLIC void intrusive_ptr_release(Comm * c); friend XBT_PUBLIC void intrusive_ptr_add_ref(Comm * c); friend Exec; friend XBT_PUBLIC void intrusive_ptr_release(Exec * e); friend XBT_PUBLIC void intrusive_ptr_add_ref(Exec * e); + friend Io; + friend XBT_PUBLIC void intrusive_ptr_release(Io* i); + friend XBT_PUBLIC void intrusive_ptr_add_ref(Io* i); +#endif protected: Activity() = default; @@ -57,7 +62,7 @@ public: * Raises: timeout exception.*/ virtual Activity* wait(double timeout) = 0; /** Cancel that activity */ - //virtual void cancel(); + virtual Activity* cancel() = 0; /** Retrieve the current state of the activity */ Activity::State get_state() { return state_; }