X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f9587e71330e7471ef675d2652cee260a0e3a96..745a5ade14924e2b2684a280e4cb75a9c1d3bee7:/src/kernel/EngineImpl.hpp

diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp
index c25063d629..f82414901d 100644
--- a/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@ -1,30 +1,32 @@
-/* Copyright (c) 2016. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2016-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <simgrid/s4u/forward.hpp>
-#include <xbt/dict.h>
+#include <simgrid/s4u/NetZone.hpp>
 
+#include <map>
 #include <string>
 #include <unordered_map>
 
 namespace simgrid {
 namespace kernel {
-namespace routing {
-class NetZoneImpl;
-class NetPoint;
-}
 
 class EngineImpl {
+  std::map<std::string, s4u::Host*> hosts_;
+  std::map<std::string, s4u::Link*> links_;
+  std::map<std::string, s4u::Storage*> storages_;
+  std::unordered_map<std::string, routing::NetPoint*> netpoints_;
+  friend s4u::Engine;
+
 public:
-  EngineImpl();
-  virtual ~EngineImpl();
-  kernel::routing::NetZoneImpl* netRoot_ = nullptr;
+  EngineImpl() = default;
 
-protected:
-  std::unordered_map<std::string, simgrid::kernel::routing::NetPoint*> netpoints_;
-  friend simgrid::s4u::Engine;
+  EngineImpl(const EngineImpl&) = delete;
+  EngineImpl& operator=(const EngineImpl&) = delete;
+  virtual ~EngineImpl();
+  routing::NetZoneImpl* netzone_root_ = nullptr;
 };
-}
-}
+
+} // namespace kernel
+} // namespace simgrid