From: Arnaud Giersch Date: Sat, 26 Oct 2019 21:26:04 +0000 (+0200) Subject: Keep deprecated wrappers "virtual". X-Git-Tag: v3.25~481 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1d0056178d75e1a88c82c6657833f24153f5ad16 Keep deprecated wrappers "virtual". --- diff --git a/include/simgrid/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp index a226509ebe..43d451ddc5 100644 --- a/include/simgrid/kernel/resource/Model.hpp +++ b/include/simgrid/kernel/resource/Model.hpp @@ -74,15 +74,17 @@ public: virtual double next_occurring_event_lazy(double now); virtual double next_occurring_event_full(double now); - XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event()") double next_occuring_event(double now) + XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event()") virtual double next_occuring_event(double now) { return next_occurring_event(now); } - XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event_lazy()") double next_occuring_event_lazy(double now) + XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event_lazy()") virtual double next_occuring_event_lazy( + double now) { return next_occurring_event_lazy(now); } - XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event_full()") double next_occuring_event_full(double now) + XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event_full()") virtual double next_occuring_event_full( + double now) { return next_occurring_event_full(now); } @@ -111,7 +113,8 @@ public: */ virtual bool next_occurring_event_is_idempotent() { return true; } - XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event_is_idempotent()") bool next_occuring_event_is_idempotent() + XBT_ATTRIB_DEPRECATED_v329( + "Please use next_occurring_event_is_idempotent()") virtual bool next_occuring_event_is_idempotent() { return next_occurring_event_is_idempotent(); }