Merge branch 'master' into disk

[simgrid.git] / include / simgrid / s4u / Exec.hpp

diff --git a/include/simgrid/s4u/Exec.hpp b/include/simgrid/s4u/Exec.hpp
index 90a2e57..6aeb5fc 100644 (file)
--- a/include/simgrid/s4u/Exec.hpp
+++ b/include/simgrid/s4u/Exec.hpp
@@ -68,8 +68,6 @@ public:
   Exec* cancel() override;
   const std::string& get_name() const { return name_; }
   const char* get_cname() const { return name_.c_str(); }
-
-  XBT_ATTRIB_DEPRECATED_v324("Please use Exec::wait_for()") void wait(double t) override { wait_for(t); }
 };
 
 class XBT_PUBLIC ExecSeq : public Exec {
@@ -97,7 +95,7 @@ class XBT_PUBLIC ExecPar : public Exec {
   std::vector<double> bytes_amounts_;
   explicit ExecPar(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
                    const std::vector<double>& bytes_amounts);
-  ExecPtr set_host(Host* host) override { THROW_UNIMPLEMENTED; }
+  ExecPtr set_host(Host*) override { /* parallel exec cannot be moved */ THROW_UNIMPLEMENTED; }
 
 public:
   ~ExecPar() = default;