X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..5089a0a98b27f5eeee62321dff4f025f1648f025:/include/simgrid/kernel/resource/Model.hpp diff --git a/include/simgrid/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp index 5d4990a27a..ee23a153de 100644 --- a/include/simgrid/kernel/resource/Model.hpp +++ b/include/simgrid/kernel/resource/Model.hpp @@ -70,9 +70,24 @@ public: * @param now The current time of the simulation * @return The delta of time till the next action will finish */ - virtual double next_occuring_event(double now); - virtual double next_occuring_event_lazy(double now); - virtual double next_occuring_event_full(double now); + virtual double next_occurring_event(double now); + 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()") virtual double next_occuring_event(double now) final + { + return next_occurring_event(now); + } + XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event_lazy()") virtual double next_occuring_event_lazy( + double now) final + { + return next_occurring_event_lazy(now); + } + XBT_ATTRIB_DEPRECATED_v329("Please use next_occurring_event_full()") virtual double next_occuring_event_full( + double now) final + { + return next_occurring_event_full(now); + } private: Action* extract_action(Action::StateSet* list); @@ -96,7 +111,13 @@ public: * The only model that is not is ns-3: computing the next timestamp moves the model up to that point, * so we need to call it only when the next timestamp of other sources is computed. */ - virtual bool next_occuring_event_is_idempotent() { return true; } + virtual bool next_occurring_event_is_idempotent() { return true; } + + XBT_ATTRIB_DEPRECATED_v329( + "Please use next_occurring_event_is_idempotent()") virtual bool next_occuring_event_is_idempotent() final + { + return next_occurring_event_is_idempotent(); + } private: std::unique_ptr maxmin_system_;