X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6d3020209fdad39e81987f91d375f482be14dee6..4b0fa756ae6e58a74c374a519389ecb9e8b6a4d9:/src/instr/instr_paje_containers.hpp

diff --git a/src/instr/instr_paje_containers.hpp b/src/instr/instr_paje_containers.hpp
index 300242f1ae..52a2b2d816 100644
--- a/src/instr/instr_paje_containers.hpp
+++ b/src/instr/instr_paje_containers.hpp
@@ -17,12 +17,18 @@ class StateType;
 class VariableType;
 
 class Container {
+  static Container* root_container_;
+  static std::map<std::string, Container*> all_containers_;
+
   long long int id_;
   std::string name_; /* Unique name of this container */
 
+protected:
+  static void set_root(Container* root) { root_container_ = root; }
+
 public:
-  static xbt::signal<void(Container&)> on_creation;
-  static xbt::signal<void(Container&)> on_destruction;
+  static xbt::signal<void(Container const&)> on_creation;
+  static xbt::signal<void(Container const&)> on_destruction;
 
   explicit Container(const std::string& name, const std::string& type_name, Container* father);
   Container(const Container&) = delete;
@@ -32,7 +38,6 @@ public:
   Type* type_; /* Type of this container */
   Container* father_;
   std::map<std::string, Container*> children_;
-  kernel::routing::NetPoint* netpoint_ = nullptr;
 
   static Container* by_name_or_null(const std::string& name);
   static Container* by_name(const std::string& name);
@@ -45,7 +50,7 @@ public:
   LinkType* get_link(const std::string& name);
   VariableType* get_variable(const std::string& name);
   void create_child(const std::string& name, const std::string& type_name);
-  static Container* get_root();
+  static Container* get_root() { return root_container_; }
 };
 
 class NetZoneContainer : public Container {
@@ -60,8 +65,8 @@ public:
 
 class HostContainer : public Container {
 public:
-  HostContainer(simgrid::s4u::Host const& host, NetZoneContainer* father);
+  HostContainer(s4u::Host const& host, NetZoneContainer* father);
 };
-}
-}
+} // namespace instr
+} // namespace simgrid
 #endif