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
also change the namespace of kernel/resource/{Action,Model}
[simgrid.git]
/
src
/
kernel
/
resource
/
Action.cpp
diff --git
a/src/kernel/resource/Action.cpp
b/src/kernel/resource/Action.cpp
index
69c3729
..
fac7b4a
100644
(file)
--- a/
src/kernel/resource/Action.cpp
+++ b/
src/kernel/resource/Action.cpp
@@
-11,11
+11,14
@@
XBT_LOG_NEW_CATEGORY(kernel, "Logging specific to the internals of SimGrid");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(resource, kernel, "Logging specific to the resources");
namespace simgrid {
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(resource, kernel, "Logging specific to the resources");
namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
-Action::Action(simgrid::surf::Model* model, double cost, bool failed) : Action(model, cost, failed, nullptr) {}
+Action::Action(simgrid::kernel::resource::Model* model, double cost, bool failed) : Action(model, cost, failed, nullptr)
+{
+}
-Action::Action(simgrid::
surf
::Model* model, double cost, bool failed, kernel::lmm::Variable* var)
+Action::Action(simgrid::
kernel::resource
::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)
@@
-226,3
+229,4
@@
double Action::getRemains()
} // namespace surf
} // namespace simgrid
} // namespace surf
} // namespace simgrid
+} // namespace simgrid