X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d43e84e981024537b56f15f7dcc937b0202cad2b..3877d90836e4902835c5464074090c4d928dac6d:/include/simgrid/s4u/ConditionVariable.hpp diff --git a/include/simgrid/s4u/ConditionVariable.hpp b/include/simgrid/s4u/ConditionVariable.hpp index e2f5cce6c1..12e0be189a 100644 --- a/include/simgrid/s4u/ConditionVariable.hpp +++ b/include/simgrid/s4u/ConditionVariable.hpp @@ -23,10 +23,9 @@ namespace s4u { */ class XBT_PUBLIC ConditionVariable { private: -#ifndef DOXYGEN - friend kernel::activity::ConditionVariableImpl; + friend simgrid::kernel::activity::ConditionVariableImpl; smx_cond_t cond_; -#endif + explicit ConditionVariable(smx_cond_t cond) : cond_(cond) {} public: ConditionVariable(ConditionVariable const&) = delete; @@ -34,12 +33,14 @@ public: friend XBT_PUBLIC void intrusive_ptr_add_ref(ConditionVariable * cond); friend XBT_PUBLIC void intrusive_ptr_release(ConditionVariable * cond); - using Ptr = boost::intrusive_ptr; - static Ptr create(); + static ConditionVariablePtr create(); /** @deprecated See Comm::get_mailbox() */ - XBT_ATTRIB_DEPRECATED_v323("Please use Comm::get_mailbox()") Ptr createConditionVariable() { return create(); } + XBT_ATTRIB_DEPRECATED_v323("Please use Comm::get_mailbox()") ConditionVariablePtr createConditionVariable() + { + return create(); + } // Wait functions without time: @@ -100,7 +101,6 @@ public: void notify_all(); }; -using ConditionVariablePtr = ConditionVariable::Ptr; } } // namespace simgrid::s4u