X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4c98af3dcf6ab83a095d195accad6943379ab220..e295c984a0d5f6ba7d8ae0e802a46d1b642c2ba2:/include/simgrid/s4u/ConditionVariable.hpp diff --git a/include/simgrid/s4u/ConditionVariable.hpp b/include/simgrid/s4u/ConditionVariable.hpp index 77811c0d03..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,18 +25,18 @@ namespace s4u { */ class XBT_PUBLIC ConditionVariable { private: - friend s_smx_cond_t; - smx_cond_t cond_; - explicit ConditionVariable(smx_cond_t cond) : cond_(cond) {} + friend kernel::activity::ConditionVariableImpl; + kernel::activity::ConditionVariableImpl* const cond_; + public: + explicit ConditionVariable(kernel::activity::ConditionVariableImpl* cond) : cond_(cond) {} ConditionVariable(ConditionVariable const&) = delete; ConditionVariable& operator=(ConditionVariable const&) = delete; 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 createConditionVariable(); + static ConditionVariablePtr create(); // Wait functions without time: @@ -95,8 +97,7 @@ public: void notify_all(); }; -using ConditionVariablePtr = ConditionVariable::Ptr; -} -} // namespace simgrid::s4u +} // namespace s4u +} // namespace simgrid #endif