From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 24 Jan 2018 16:22:18 +0000 (+0100)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3.19~312
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0b63f78dc217b79305cef05bd2200069d3e24475?hp=87ff63372b9588e7b6ca2a1faaecebad660bf8c4

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index c4c9f792aa..5e07894d8d 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -21,6 +21,8 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors");
 namespace simgrid {
 namespace s4u {
 
+simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::onCreation;
+
 // ***** Actor creation *****
 ActorPtr Actor::self()
 {
diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 63bef0510e..d2b51d4e41 100644
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -146,9 +146,6 @@ void SIMIX_process_empty_trash()
 
 namespace simgrid {
 
-namespace s4u {
-simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::onCreation; // TODO cheinrich is this the right location here?
-}
 namespace simix {
 
 ActorImpl::~ActorImpl()