X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8f7ec2e4b08cd2b27aa34b2c9fec2af0ad79d53a..d94f920eb99dc33e8c592e89bcbbb3a8e50fe919:/src/s4u/s4u_Engine.cpp diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index d0160a00fe..8da467da70 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -9,9 +9,6 @@ #include #include -#define SIMIX_H_NO_DEPRECATED_WARNING // avoid deprecation warning on include (remove with XBT_ATTRIB_DEPRECATED_v333) -#include - #include "mc/mc.h" #include "src/instr/instr_private.hpp" #include "src/kernel/EngineImpl.hpp" @@ -30,8 +27,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_engine, s4u, "Logging specific to S4U (engin static simgrid::kernel::actor::ActorCode maestro_code; -namespace simgrid { -namespace s4u { +namespace simgrid::s4u { xbt::signal Engine::on_platform_creation; xbt::signal Engine::on_platform_created; xbt::signal Engine::on_simulation_start; @@ -460,8 +456,7 @@ Engine* Engine::set_default_comm_data_copy_callback( return this; } -} // namespace s4u -} // namespace simgrid +} // namespace simgrid::s4u /* **************************** Public C interface *************************** */ void simgrid_init(int* argc, char** argv) @@ -506,7 +501,3 @@ void simgrid_set_maestro(void (*code)(void*), void* data) #endif maestro_code = std::bind(code, data); } -void SIMIX_set_maestro(void (*code)(void*), void* data) // XBT_ATTRIB_DEPRECATED_v333 -{ - simgrid_set_maestro(code, data); -}