A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
please clang
[simgrid.git]
/
include
/
simgrid
/
s4u
/
ConditionVariable.hpp
diff --git
a/include/simgrid/s4u/ConditionVariable.hpp
b/include/simgrid/s4u/ConditionVariable.hpp
index
12e0be1
..
6e6ec31
100644
(file)
--- a/
include/simgrid/s4u/ConditionVariable.hpp
+++ b/
include/simgrid/s4u/ConditionVariable.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-201
9
. 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. */
/* 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:
*/
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;
public:
ConditionVariable(ConditionVariable const&) = delete;
ConditionVariable& operator=(ConditionVariable const&) = delete;
@@
-36,11
+37,14
@@
public:
static ConditionVariablePtr create();
static ConditionVariablePtr create();
+#ifndef DOXYGEN
/** @deprecated See Comm::get_mailbox() */
/** @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();
}
{
return create();
}
+#endif
// Wait functions without time:
// Wait functions without time:
@@
-101,7
+105,7
@@
public:
void notify_all();
};
void notify_all();
};
-}
-} // namespace simgrid
::s4u
+}
// namespace s4u
+} // namespace simgrid
#endif
#endif