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
kill some internal C type aliases
[simgrid.git]
/
src
/
surf
/
surf_interface.cpp
diff --git
a/src/surf/surf_interface.cpp
b/src/surf/surf_interface.cpp
index
fa9aaa2
..
684d22a
100644
(file)
--- a/
src/surf/surf_interface.cpp
+++ b/
src/surf/surf_interface.cpp
@@
-518,7
+518,7
@@
void Model::updateActionsStateFull(double /*now*/, double /*delta*/)
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
-Resource::Resource(Model* model, const std::string& name,
lmm_constraint_t
constraint)
+Resource::Resource(Model* model, const std::string& name,
kernel::lmm::Constraint*
constraint)
: name_(name), model_(model), constraint_(constraint)
{}
: name_(name), model_(model), constraint_(constraint)
{}
@@
-565,9
+565,9
@@
bool Resource::operator==(const Resource &other) const {
return name_ == other.name_;
}
return name_ == other.name_;
}
-
lmm_constraint_t
Resource::constraint() const
+
kernel::lmm::Constraint*
Resource::constraint() const
{
{
- return const
raint_
;
+ return const
_cast<kernel::lmm::Constraint*>(constraint_)
;
}
}
}
}
@@
-584,7
+584,7
@@
Action::Action(simgrid::surf::Model* model, double cost, bool failed) : Action(m
{
}
{
}
-Action::Action(simgrid::surf::Model* model, double cost, bool failed,
lmm_variable_t
var)
+Action::Action(simgrid::surf::Model* model, double cost, bool failed,
kernel::lmm::Variable*
var)
: remains_(cost), start_(surf_get_clock()), cost_(cost), model_(model), variable_(var)
{
if (failed)
: remains_(cost), start_(surf_get_clock()), cost_(cost), model_(model), variable_(var)
{
if (failed)