Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / kernel / resource / Model.cpp

diff --git a/src/kernel/resource/Model.cpp b/src/kernel/resource/Model.cpp
index ac5f5ecf297c9908a5f0482649e3714021b42810..5d518efcb774485074607bedacf242a114cb7dec 100644 (file)
--- a/src/kernel/resource/Model.cpp
+++ b/src/kernel/resource/Model.cpp
@@ -9,7 +9,8 @@
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(resource);
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
 
 Model::Model() : maxminSystem_(nullptr)
 {
@@ -165,3 +166,4 @@ void Model::updateActionsStateFull(double /*now*/, double /*delta*/)
 
 } // namespace surf
 } // namespace simgrid
+} // namespace simgrid