Merge branch 'master' of https://framagit.org/simgrid/simgrid into no_simix_global

diff --cc src/kernel/EngineImpl.cpp
Simple merge

diff --cc src/kernel/EngineImpl.hpp
index 3a32bc9,b448c06..a775191
--- 1/src/kernel/EngineImpl.hpp
--- 2/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@@ -64,11 -68,9 +68,11 @@@ class EngineImpl 
  #endif
  
    std::vector<xbt::Task<void()>> tasks;
-   std::vector<xbt::Task<void()>> tasksTemp;
  
    std::mutex mutex_;
 +  static EngineImpl* instance_;
 +
+   std::unique_ptr<void, std::function<int(void*)>> platf_handle_; //!< handle for platform library
    friend s4u::Engine;
  
  public:
@@@ -79,9 -79,8 +83,10 @@@
    EngineImpl(const EngineImpl&) = delete;
    EngineImpl& operator=(const EngineImpl&) = delete;
    virtual ~EngineImpl();
 +  static void shutdown();
 +#endif
  
+   void load_platform(const std::string& platf);
    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);

diff --cc src/s4u/s4u_Engine.cpp
Simple merge

diff --cc src/simix/smx_global.cpp
Simple merge

diff --cc src/simix/smx_private.hpp
Simple merge