X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/af75444cb236cd53e4406b393bd5add0e7aca5dc..989e6d7e4cb105760aff9acce9ac2d26de2f793d:/src/kernel/EngineImpl.hpp diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp index b84f5430da..4c25e54720 100644 --- a/src/kernel/EngineImpl.hpp +++ b/src/kernel/EngineImpl.hpp @@ -19,7 +19,6 @@ #include "src/kernel/activity/SleepImpl.hpp" #include "src/kernel/activity/Synchro.hpp" #include "src/kernel/actor/ActorImpl.hpp" -#include "src/kernel/resource/SplitDuplexLinkImpl.hpp" #include #include @@ -58,6 +57,7 @@ class EngineImpl { friend s4u::Engine; std::vector cmdline_; // Copy of the argv we got (including argv[0]) + public: EngineImpl() = default; @@ -102,8 +102,14 @@ public: const std::vector& get_all_models() const { return models_; } static bool has_instance() { return s4u::Engine::has_instance(); } - static EngineImpl* get_instance() { return s4u::Engine::get_instance()->pimpl; } - static EngineImpl* get_instance(int* argc, char** argv) { return s4u::Engine::get_instance(argc, argv)->pimpl; } + static EngineImpl* get_instance() + { + return s4u::Engine::get_instance()->pimpl_; + } + static EngineImpl* get_instance(int* argc, char** argv) + { + return s4u::Engine::get_instance(argc, argv)->pimpl_; + } actor::ActorCodeFactory get_function(const std::string& name) { @@ -145,10 +151,6 @@ public: void display_all_actor_status() const; void run_all_actors(); - /* @brief Finish simulation initialization - * This function must be called before the first call to solve() - */ - void presolve() const; /** @brief Performs a part of the simulation * @param max_date Maximum date to update the simulation to, or -1 * @return the elapsed time, or -1.0 if no event could be executed