Storage-kill: remove java bindings

[simgrid.git] / src / kernel / EngineImpl.hpp

diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp
index 5712dc9..6a3ee06 100644 (file)
--- a/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@ -1,12 +1,16 @@
-/* Copyright (c) 2016-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2016-2021. 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 <map>
+#ifndef SIMGRID_KERNEL_ENGINEIMPL_HPP
+#define SIMGRID_KERNEL_ENGINEIMPL_HPP
+
 #include <simgrid/s4u/Engine.hpp>
 #include <simgrid/s4u/NetZone.hpp>
 #include <simgrid/simix.hpp>
+
+#include <map>
 #include <string>
 #include <unordered_map>
 
@@ -14,9 +18,8 @@ namespace simgrid {
 namespace kernel {
 
 class EngineImpl {
-  std::map<std::string, s4u::Host*> hosts_;
-  std::map<std::string, resource::LinkImpl*> links_;
-  std::map<std::string, resource::StorageImpl*> storages_;
+  std::map<std::string, s4u::Host*, std::less<>> hosts_;
+  std::map<std::string, resource::LinkImpl*, std::less<>> links_;
   std::unordered_map<std::string, routing::NetPoint*> netpoints_;
   std::unordered_map<std::string, actor::ActorCodeFactory> registered_functions; // Maps function names to actor code
   actor::ActorCodeFactory default_function; // Function to use as a fallback when the provided name matches nothing
@@ -30,9 +33,9 @@ public:
   EngineImpl& operator=(const EngineImpl&) = delete;
   virtual ~EngineImpl();
 
-  void load_deployment(const std::string& file);
-  void register_function(const std::string& name, actor::ActorCodeFactory code);
-  void register_default(actor::ActorCodeFactory code);
+  void load_deployment(const std::string& file) const;
+  void register_function(const std::string& name, const actor::ActorCodeFactory& code);
+  void register_default(const actor::ActorCodeFactory& code);
 
   routing::NetZoneImpl* netzone_root_ = nullptr;
   static EngineImpl* get_instance() { return simgrid::s4u::Engine::get_instance()->pimpl; }
@@ -48,3 +51,5 @@ public:
 
 } // namespace kernel
 } // namespace simgrid
+
+#endif