X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c979a2a19b47295bc467cfda3c6541f60b6fe13..771173935e00663e8f6ae0a903e5b38f3d8abf6e:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index c49574de4f..f450f3bd2e 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -14,6 +14,9 @@ #include #include + +#include + #include "surf/trace_mgr.h" #include "xbt/lib.h" #include "surf/surf_routing.h" @@ -22,45 +25,6 @@ #include "src/surf/surf_private.h" #include "src/internal_config.h" -#ifdef LIBSIGC -#include -namespace simgrid { -namespace surf { - // Wraps sigc++ signals with the interface of boost::signals2: - template class signal; - template - class signal { - private: - sigc::signal sig_; - public: - template XBT_ALWAYS_INLINE - void connect(T&& slot) - { - sig_.connect(std::forward(slot)); - } - template XBT_ALWAYS_INLINE - void connect(Res(*slot)(Args...)) - { - sig_.connect(sigc::ptr_fun(slot)); - } - template - R operator()(Args&&... args) const - { - return sig_.emit(std::forward(args)...); - } - }; -} -} -#else -#include -namespace simgrid { -namespace surf { - template - using signal = ::boost::signals2::signal; -} -} -#endif - extern XBT_PRIVATE tmgr_history_t history; #define NO_MAX_DURATION -1.0 @@ -86,7 +50,7 @@ extern XBT_PRIVATE double sg_sender_gap; namespace simgrid { namespace surf { -extern XBT_PRIVATE simgrid::surf::signal surfExitCallbacks; +extern XBT_PRIVATE simgrid::xbt::signal surfExitCallbacks; } }