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
untested C interface to Condition Variables
[simgrid.git]
/
include
/
simgrid
/
s4u
/
ConditionVariable.hpp
diff --git
a/include/simgrid/s4u/ConditionVariable.hpp
b/include/simgrid/s4u/ConditionVariable.hpp
index
12e0be1
..
f11df5c
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. */
@@
-6,6
+6,8
@@
#ifndef SIMGRID_S4U_COND_VARIABLE_HPP
#define SIMGRID_S4U_COND_VARIABLE_HPP
#ifndef SIMGRID_S4U_COND_VARIABLE_HPP
#define SIMGRID_S4U_COND_VARIABLE_HPP
+#include <simgrid/forward.h>
+
#include <simgrid/chrono.hpp>
#include <simgrid/s4u/Mutex.hpp>
#include <simgrid/chrono.hpp>
#include <simgrid/s4u/Mutex.hpp>
@@
-23,11
+25,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* cons
t cond_;
- explicit ConditionVariable(smx_cond_t cond) : cond_(cond) {}
public:
public:
+ explicit ConditionVariable(kernel::activity::ConditionVariableImpl* cond) : cond_(cond) {}
ConditionVariable(ConditionVariable const&) = delete;
ConditionVariable& operator=(ConditionVariable const&) = delete;
ConditionVariable(ConditionVariable const&) = delete;
ConditionVariable& operator=(ConditionVariable const&) = delete;
@@
-36,12
+38,6
@@
public:
static ConditionVariablePtr create();
static ConditionVariablePtr create();
- /** @deprecated See Comm::get_mailbox() */
- XBT_ATTRIB_DEPRECATED_v323("Please use Comm::get_mailbox()") ConditionVariablePtr createConditionVariable()
- {
- return create();
- }
-
// Wait functions without time:
void wait(MutexPtr lock);
// Wait functions without time:
void wait(MutexPtr lock);
@@
-101,7
+97,7
@@
public:
void notify_all();
};
void notify_all();
};
-}
-} // namespace simgrid
::s4u
+}
// namespace s4u
+} // namespace simgrid
#endif
#endif