X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17c819afc4ceda4000eec137c8fee35168253b4d..61ab0b23d55ea10365ba11d22b8c11b39cbf16e9:/src/simix/smx_private.hpp diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp index e220311d6e..bcbb2f6a8d 100644 --- a/src/simix/smx_private.hpp +++ b/src/simix/smx_private.hpp @@ -8,6 +8,7 @@ #include "simgrid/s4u/Actor.hpp" #include "src/kernel/context/Context.hpp" +#include #include #include @@ -18,7 +19,7 @@ namespace simgrid { namespace simix { class Global { - friend XBT_PUBLIC bool simgrid::s4u::this_actor::isMaestro(); + friend XBT_PUBLIC bool simgrid::s4u::this_actor::is_maestro(); public: smx_context_factory_t context_factory = nullptr; @@ -63,8 +64,6 @@ public: } } -extern "C" { - XBT_PUBLIC_DATA std::unique_ptr simix_global; XBT_PUBLIC void SIMIX_clean(); @@ -80,6 +79,5 @@ XBT_PUBLIC void SIMIX_clean(); _smx_throw_issuer->exception = std::make_exception_ptr(e); \ } else \ ((void)0) -} #endif