From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Thu, 10 Oct 2019 09:15:07 +0000 (+0200)
Subject: Merge branch 'master' into CRTP
X-Git-Tag: v3.25~556
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ce930ad96b622e2b3856b7d9c3d97e60ec2c93a1?hp=--cc

Merge branch 'master' into CRTP
---

ce930ad96b622e2b3856b7d9c3d97e60ec2c93a1
diff --cc include/simgrid/s4u/Exec.hpp
index bf9acf321c,989aa69ab3..1e9de25b5b
--- a/include/simgrid/s4u/Exec.hpp
+++ b/include/simgrid/s4u/Exec.hpp
@@@ -25,8 -26,8 +25,7 @@@ class XBT_PUBLIC Exec : public Activity
    double priority_              = 1.0;
    double bound_                 = 0.0;
    double timeout_               = 0.0;
 -  std::string tracing_category_ = "";
    std::atomic_int_fast32_t refcount_{0};
-   Host* host_ = nullptr;
  
  protected:
    Exec();