X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a39a45af5e19dfb8b8ed2cb084b3a6b518d179e4..a769d0bfd8cf7d4e8f9ae4dfbcf69d8a851508da:/include/simgrid/s4u/ConditionVariable.hpp diff --git a/include/simgrid/s4u/ConditionVariable.hpp b/include/simgrid/s4u/ConditionVariable.hpp index 12e0be189a..6e6ec3122b 100644 --- a/include/simgrid/s4u/ConditionVariable.hpp +++ b/include/simgrid/s4u/ConditionVariable.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -23,10 +23,11 @@ namespace s4u { */ class XBT_PUBLIC ConditionVariable { private: - friend simgrid::kernel::activity::ConditionVariableImpl; - smx_cond_t cond_; + friend kernel::activity::ConditionVariableImpl; + kernel::activity::ConditionVariableImpl* const cond_; + + explicit ConditionVariable(kernel::activity::ConditionVariableImpl* cond) : cond_(cond) {} - explicit ConditionVariable(smx_cond_t cond) : cond_(cond) {} public: ConditionVariable(ConditionVariable const&) = delete; ConditionVariable& operator=(ConditionVariable const&) = delete; @@ -36,11 +37,14 @@ public: static ConditionVariablePtr create(); +#ifndef DOXYGEN /** @deprecated See Comm::get_mailbox() */ - XBT_ATTRIB_DEPRECATED_v323("Please use Comm::get_mailbox()") ConditionVariablePtr createConditionVariable() + XBT_ATTRIB_DEPRECATED_v323("Please use ConditionVariableImpl::create()") ConditionVariablePtr + createConditionVariable() { return create(); } +#endif // Wait functions without time: @@ -101,7 +105,7 @@ public: void notify_all(); }; -} -} // namespace simgrid::s4u +} // namespace s4u +} // namespace simgrid #endif