X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/640e6f6494f5e1151f6436aea0e0c515da2c144b..fbcf6ab31cae1988be858f9f894dafe529c575d7:/include/simgrid/s4u/Exec.hpp?ds=sidebyside diff --git a/include/simgrid/s4u/Exec.hpp b/include/simgrid/s4u/Exec.hpp index beed7e1df8..ecfa6cec59 100644 --- a/include/simgrid/s4u/Exec.hpp +++ b/include/simgrid/s4u/Exec.hpp @@ -37,14 +37,14 @@ public: #ifndef DOXYGEN Exec(Exec const&) = delete; Exec& operator=(Exec const&) = delete; -#endif friend ExecSeq; friend ExecPar; friend XBT_PUBLIC void intrusive_ptr_release(Exec* e); friend XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e); - static xbt::signal on_start; - static xbt::signal on_completion; +#endif + static xbt::signal on_start; + static xbt::signal on_completion; virtual Exec* start() override = 0; virtual double get_remaining_ratio() = 0; @@ -61,11 +61,6 @@ public: ExecPtr set_timeout(double timeout); Exec* cancel() override; - XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_priority()") ExecPtr setPriority(double priority) - { - return set_priority(priority); - } - XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_bound()") ExecPtr setBound(double bound) { return set_bound(bound); } XBT_ATTRIB_DEPRECATED_v324("Please use Exec::wait_for()") void wait(double t) override { wait_for(t); } }; @@ -86,16 +81,6 @@ public: double get_remaining() override; double get_remaining_ratio() override; - -#ifndef DOXYGEN - //////////////// Deprecated functions - XBT_ATTRIB_DEPRECATED_v323("Please use Exec::set_host()") ExecPtr setHost(Host* host) { return set_host(host); } - XBT_ATTRIB_DEPRECATED_v323("Please use Exec::get_host()") Host* getHost() { return get_host(); } - XBT_ATTRIB_DEPRECATED_v323("Please use Exec::get_remaining_ratio()") double getRemainingRatio() - { - return get_remaining_ratio(); - } -#endif }; class XBT_PUBLIC ExecPar : public Exec {