From: SUTER Frederic Date: Mon, 3 Jan 2022 08:06:31 +0000 (+0100) Subject: forgot that in making Activities extendable. Should please Asan X-Git-Tag: v3.30~143 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/18e2a7624ba5de43c07f105984b7a150c0dd65d2 forgot that in making Activities extendable. Should please Asan --- diff --git a/docs/source/conf.py b/docs/source/conf.py index 1b78ffd40d..3ad1480a17 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -128,6 +128,7 @@ nitpick_ignore = [ ('cpp:identifier', 'uint64_t'), ('cpp:identifier', 'xbt'), ('cpp:identifier', 'xbt_dynar_s'), + ('cpp:identifier', 'xbt::Extendable'), ('cpp:identifier', 'xbt::Extendable'), ('cpp:identifier', 'xbt::Extendable'), ('cpp:identifier', 'xbt::Extendable'), diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp index 2a8504c1eb..e5aca02bf7 100644 --- a/include/simgrid/s4u/Activity.hpp +++ b/include/simgrid/s4u/Activity.hpp @@ -21,6 +21,9 @@ XBT_LOG_EXTERNAL_CATEGORY(s4u_activity); namespace simgrid { + +extern template class XBT_PUBLIC xbt::Extendable; + namespace s4u { /** @brief Activities diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp index e06fb23233..6eaa564831 100644 --- a/src/s4u/s4u_Activity.cpp +++ b/src/s4u/s4u_Activity.cpp @@ -18,6 +18,9 @@ XBT_LOG_EXTERNAL_CATEGORY(s4u); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_activity, s4u, "S4U activities"); namespace simgrid { + +template class xbt::Extendable; + namespace s4u { xbt::signal Activity::on_veto;