From: Fred Suter Date: Tue, 23 May 2023 08:17:57 +0000 (-0400) Subject: another try to please clang X-Git-Tag: v3.34~109^2~6 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/14395882a33613da82251cc43bce52f55f66c617 another try to please clang --- diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp index cbedfaaaf4..4879ad3ea1 100644 --- a/include/simgrid/s4u/Activity.hpp +++ b/include/simgrid/s4u/Activity.hpp @@ -239,7 +239,7 @@ template class Activity_T : public Activity { std::string tracing_category_ = ""; public: - static xbt::signal on_completion; + inline static xbt::signal on_completion; /*! Add a callback fired when the activity completes (either normally, cancelled or failed) */ static void on_completion_cb(const std::function& cb) { on_completion.connect(cb); } diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp index d9c236accd..4b593876ec 100644 --- a/src/s4u/s4u_Activity.cpp +++ b/src/s4u/s4u_Activity.cpp @@ -27,7 +27,6 @@ namespace s4u { xbt::signal Activity::on_veto; xbt::signal Activity::on_suspended; xbt::signal Activity::on_resumed; -template extern xbt::signal Activity_T::on_completion; std::set* Activity::vetoed_activities_ = nullptr;