X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8937f1426cc4c3bbe77178ce3a9cdc0687263a8e..ac080087b39ef79ff497d3992ff04b3e20fe40b2:/include/simgrid/s4u/ConditionVariable.hpp diff --git a/include/simgrid/s4u/ConditionVariable.hpp b/include/simgrid/s4u/ConditionVariable.hpp index 05f5c411e5..f11df5c7a7 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. */ @@ -6,6 +6,8 @@ #ifndef SIMGRID_S4U_COND_VARIABLE_HPP #define SIMGRID_S4U_COND_VARIABLE_HPP +#include + #include #include @@ -23,11 +25,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(smx_cond_t cond) : cond_(cond) {} public: + explicit ConditionVariable(kernel::activity::ConditionVariableImpl* cond) : cond_(cond) {} ConditionVariable(ConditionVariable const&) = delete; ConditionVariable& operator=(ConditionVariable const&) = delete; @@ -36,14 +38,6 @@ public: static ConditionVariablePtr create(); -#ifndef DOXYGEN - /** @deprecated See Comm::get_mailbox() */ - XBT_ATTRIB_DEPRECATED_v323("Please use Comm::get_mailbox()") ConditionVariablePtr createConditionVariable() - { - return create(); - } -#endif - // Wait functions without time: void wait(MutexPtr lock); @@ -103,7 +97,7 @@ public: void notify_all(); }; -} -} // namespace simgrid::s4u +} // namespace s4u +} // namespace simgrid #endif