From 5a9daf6dc6023e088fc54646fbe95de0bf872f2d Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 25 Mar 2018 17:59:38 +0200 Subject: [PATCH] kill an unused function The prototype was s::k::actor::set_maestro while its declaration was simgrid::simix::set_maestro (since one commit), proving that it's not used. The used function is SIMIX_set_maestro(), which should be converted to C++ for sure, but I'm not sure yet of how to do it properly. --- src/simix/ActorImpl.hpp | 1 - src/simix/smx_global.cpp | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp index f80b0e6215..c2449fbfd8 100644 --- a/src/simix/ActorImpl.hpp +++ b/src/simix/ActorImpl.hpp @@ -129,7 +129,6 @@ typedef boost::intrusive::list> SynchroList; -XBT_PUBLIC void set_maestro(std::function code); XBT_PUBLIC void create_maestro(std::function code); } } // namespace kernel diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 809323c760..adcb65e55d 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -169,21 +169,16 @@ static void kill_process(smx_actor_t process) SIMIX_process_kill(process, nullptr); } -static std::function maestro_code; namespace simgrid { namespace simix { simgrid::xbt::signal onDeadlock; -XBT_PUBLIC void set_maestro(std::function code) -{ - maestro_code = std::move(code); -} - } } +static std::function maestro_code; void SIMIX_set_maestro(void (*code)(void*), void* data) { #ifdef _WIN32 @@ -195,9 +190,6 @@ void SIMIX_set_maestro(void (*code)(void*), void* data) /** * \ingroup SIMIX_API * \brief Initialize SIMIX internal data. - * - * \param argc Argc - * \param argv Argv */ void SIMIX_global_init(int *argc, char **argv) { -- 2.20.1