From e45a0fd3115991c297ede2d5675e46976990f51a Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 14 Nov 2023 20:48:40 +0100 Subject: [PATCH] Fix an ODR reported by ASan --- include/simgrid/plugins/chiller.hpp | 2 +- src/plugins/chiller.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/simgrid/plugins/chiller.hpp b/include/simgrid/plugins/chiller.hpp index 8f9611bda6..bf28b485c8 100644 --- a/include/simgrid/plugins/chiller.hpp +++ b/include/simgrid/plugins/chiller.hpp @@ -68,7 +68,7 @@ private: friend void intrusive_ptr_add_ref(Chiller* o) { o->refcount_.fetch_add(1, std::memory_order_relaxed); } #endif - inline static xbt::signal on_power_change; + static xbt::signal on_power_change; xbt::signal on_this_power_change; public: diff --git a/src/plugins/chiller.cpp b/src/plugins/chiller.cpp index 3cec29d560..7d2b9de4c7 100644 --- a/src/plugins/chiller.cpp +++ b/src/plugins/chiller.cpp @@ -57,6 +57,7 @@ chiller is not active, the temperature of the room increases. XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Chiller, kernel, "Logging specific to the solar panel plugin"); namespace simgrid::plugins { +xbt::signal Chiller::on_power_change; // initialisation of static field /* ChillerModel */ -- 2.20.1