From 8a94013d0abeeb5824c06070251b4d0760ed6b43 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 4 Apr 2019 10:29:30 +0200
Subject: [PATCH] Declare log category where it is actually used.

---
 src/simix/libsmx.cpp         | 2 --
 src/simix/popping_bodies.cpp | 3 +++
 src/simix/simcalls.py        | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index d80c37579d..b44eb2d597 100644
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -21,8 +21,6 @@
 #include "src/mc/mc_replay.hpp"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
-
 #include "popping_bodies.cpp"
 
 /**
diff --git a/src/simix/popping_bodies.cpp b/src/simix/popping_bodies.cpp
index b86e34a8db..8888f2ae89 100644
--- a/src/simix/popping_bodies.cpp
+++ b/src/simix/popping_bodies.cpp
@@ -19,8 +19,11 @@
 #include "xbt/ex.h"
 #include <functional>
 #include <simgrid/simix.hpp>
+#include <xbt/log.h>
 /** @cond */ // Please Doxygen, don't look at this
 
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
+
 template<class R, class... T>
 inline static R simcall(e_smx_simcall_t call, T const&... t)
 {
diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index a650164384..ae5f79a1fd 100755
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -370,9 +370,12 @@ if __name__ == '__main__':
     fd.write('#include "xbt/ex.h"\n')
     fd.write('#include <functional>\n')
     fd.write('#include <simgrid/simix.hpp>\n')
+    fd.write('#include <xbt/log.h>\n')
 
     fd.write("/** @cond */ // Please Doxygen, don't look at this\n")
     fd.write('''
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
+
 template<class R, class... T>
 inline static R simcall(e_smx_simcall_t call, T const&... t)
 {
-- 
2.20.1