From b8cc7440ed3cd81055016a203e18a9313c9455a3 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 30 Jan 2020 11:42:41 +0100 Subject: [PATCH] small cleanups in the s4u::Activities --- include/simgrid/s4u/Activity.hpp | 8 -------- src/kernel/activity/ActivityImpl.hpp | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp index 23438e5022..3c85088d66 100644 --- a/include/simgrid/s4u/Activity.hpp +++ b/include/simgrid/s4u/Activity.hpp @@ -22,18 +22,10 @@ namespace s4u { */ class XBT_PUBLIC Activity { friend Comm; - friend XBT_PUBLIC void intrusive_ptr_release(Comm * c); - friend XBT_PUBLIC void intrusive_ptr_add_ref(Comm * c); - friend Exec; friend ExecSeq; friend ExecPar; - 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); protected: Activity() = default; diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp index c1c8de5bb8..7d870f13ac 100644 --- a/src/kernel/activity/ActivityImpl.hpp +++ b/src/kernel/activity/ActivityImpl.hpp @@ -56,7 +56,7 @@ public: virtual void register_simcall(smx_simcall_t simcall); void clean_action(); virtual double get_remaining() const; - // boost::intrusive_ptr support: + // Support for the boost::intrusive_ptr datatype friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity); friend XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity); -- 2.20.1