X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f3527d281baac664d10ce7086e0d0138e1389d7..07eb08dd092e89871ab3ed9fcf41ad0219598e3b:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 684d22a961..d887e1f4ae 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -516,9 +516,10 @@ void Model::updateActionsStateFull(double /*now*/, double /*delta*/) ************/ namespace simgrid { -namespace surf { +namespace kernel { +namespace model { -Resource::Resource(Model* model, const std::string& name, kernel::lmm::Constraint* constraint) +Resource::Resource(surf::Model* model, const std::string& name, lmm::Constraint* constraint) : name_(name), model_(model), constraint_(constraint) {} @@ -546,7 +547,7 @@ double Resource::getLoad() return constraint_->get_usage(); } -Model* Resource::model() const +surf::Model* Resource::model() const { return model_; } @@ -571,6 +572,7 @@ kernel::lmm::Constraint* Resource::constraint() const } } +} // namespace kernel } /**********