From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Fri, 24 Jan 2020 17:42:07 +0000 (+0100)
Subject: Merge branch 'depencencies' of https://framagit.org/simgrid/simgrid into depencencies
X-Git-Tag: v3.25~33^2^2~15
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/149c63f36e15b8500b1e826bda5138318ff7ba2b

Merge branch 'depencencies' of https://framagit.org/simgrid/simgrid into depencencies
---

149c63f36e15b8500b1e826bda5138318ff7ba2b
diff --cc include/simgrid/s4u/Activity.hpp
index da23b8299d,ccdcea1678..76d41c00bc
--- a/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@@ -12,11 -12,8 +12,10 @@@
  #include <simgrid/forward.h>
  #include <string>
  #include <vector>
- #include <xbt/log.hpp>
  #include <xbt/signal.hpp>
  
 +XBT_LOG_EXTERNAL_CATEGORY(s4u_activity);
 +
  namespace simgrid {
  namespace s4u {