X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74c54d770c8a3c775a801b64fdaa5b84843798c0..3ae6123aa28d3dd81f94623705f692d0cde6de57:/include/simgrid/s4u/ConditionVariable.hpp diff --git a/include/simgrid/s4u/ConditionVariable.hpp b/include/simgrid/s4u/ConditionVariable.hpp index cf869399d1..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. */ @@ -24,19 +24,27 @@ namespace s4u { class XBT_PUBLIC ConditionVariable { private: friend kernel::activity::ConditionVariableImpl; - smx_cond_t cond_; - explicit ConditionVariable(smx_cond_t cond) : cond_(cond) {} + kernel::activity::ConditionVariableImpl* const cond_; + + explicit ConditionVariable(kernel::activity::ConditionVariableImpl* cond) : cond_(cond) {} + public: 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 create(); + static ConditionVariablePtr create(); - XBT_ATTRIB_DEPRECATED_v323("Please use Comm::get_mailbox()") Ptr createConditionVariable() { return create(); } +#ifndef DOXYGEN + /** @deprecated See Comm::get_mailbox() */ + XBT_ATTRIB_DEPRECATED_v323("Please use ConditionVariableImpl::create()") ConditionVariablePtr + createConditionVariable() + { + return create(); + } +#endif // Wait functions without time: @@ -97,8 +105,7 @@ public: void notify_all(); }; -using ConditionVariablePtr = ConditionVariable::Ptr; -} -} // namespace simgrid::s4u +} // namespace s4u +} // namespace simgrid #endif