X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38f7ddbf61f574a934f191ef2d8358d9f8be1f96..c9dd5647a7d7e6404fdbf2828f331ee4c35611e3:/include/simgrid/s4u/Activity.hpp diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp index 57ab0371c0..f75e0d1df7 100644 --- a/include/simgrid/s4u/Activity.hpp +++ b/include/simgrid/s4u/Activity.hpp @@ -9,7 +9,7 @@ #include #include -typedef enum { inited = 0, started, canceled, errored, finished } e_s4u_activity_state_t; +enum e_s4u_activity_state_t { inited = 0, started, canceled, errored, finished }; namespace simgrid { namespace s4u { @@ -20,12 +20,15 @@ namespace s4u { */ XBT_PUBLIC_CLASS Activity { friend Comm; - friend void intrusive_ptr_release(Comm * c); - friend void intrusive_ptr_add_ref(Comm * c); + 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); protected: Activity() = default; - ~Activity() = default; + virtual ~Activity() = default; public: Activity(Activity const&) = delete;