From f424c1aa5a51f79634d721711006e723effb4b3f Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Sun, 25 Apr 2021 14:14:54 +0200
Subject: [PATCH 1/1] The header <typeinfo> must be included before using
 typeid.

---
 src/instr/instr_paje_trace.cpp        | 1 -
 src/kernel/actor/ActorImpl.cpp        | 1 +
 src/kernel/context/ContextSwapped.cpp | 1 +
 src/kernel/context/ContextThread.cpp  | 1 +
 src/kernel/lmm/maxmin.cpp             | 1 +
 src/simix/libsmx.cpp                  | 1 +
 src/xbt/config.cpp                    | 2 --
 src/xbt/exception.cpp                 | 1 +
 8 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index 99d73f814e..460b43a4ba 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -9,7 +9,6 @@
 #include "src/instr/instr_private.hpp"
 #include "src/instr/instr_smpi.hpp"
 #include "src/smpi/include/private.hpp"
-#include "typeinfo"
 #include <fstream>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr, "tracing event system");
diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp
index bd04da8f0f..afcc725231 100644
--- a/src/kernel/actor/ActorImpl.cpp
+++ b/src/kernel/actor/ActorImpl.cpp
@@ -19,6 +19,7 @@
 #include "src/surf/cpu_interface.hpp"
 
 #include <boost/core/demangle.hpp>
+#include <typeinfo>
 #include <utility>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp
index d93d602159..35e8d89281 100644
--- a/src/kernel/context/ContextSwapped.cpp
+++ b/src/kernel/context/ContextSwapped.cpp
@@ -14,6 +14,7 @@
 
 #include <boost/core/demangle.hpp>
 #include <memory>
+#include <typeinfo>
 
 #ifdef _WIN32
 #include <malloc.h>
diff --git a/src/kernel/context/ContextThread.cpp b/src/kernel/context/ContextThread.cpp
index ee7ba981bd..2a3b815f8c 100644
--- a/src/kernel/context/ContextThread.cpp
+++ b/src/kernel/context/ContextThread.cpp
@@ -13,6 +13,7 @@
 
 #include <boost/core/demangle.hpp>
 #include <functional>
+#include <typeinfo>
 #include <utility>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp
index 33b84a93f4..4866585b32 100644
--- a/src/kernel/lmm/maxmin.cpp
+++ b/src/kernel/lmm/maxmin.cpp
@@ -5,6 +5,7 @@
 
 #include "src/kernel/lmm/maxmin.hpp"
 #include <boost/core/demangle.hpp>
+#include <typeinfo>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf, "Logging specific to SURF (maxmin)");
 
diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 9bec9a4df4..2744ea4336 100644
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -27,6 +27,7 @@
 
 #include <boost/core/demangle.hpp>
 #include <string>
+#include <typeinfo>
 
 /**
  * @ingroup simix_host_management
diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp
index 7cb1f63774..3d7c730097 100644
--- a/src/xbt/config.cpp
+++ b/src/xbt/config.cpp
@@ -16,8 +16,6 @@
 #include <stdexcept>
 #include <string>
 #include <string>
-#include <type_traits>
-#include <typeinfo>
 #include <vector>
 
 #include "simgrid/Exception.hpp"
diff --git a/src/xbt/exception.cpp b/src/xbt/exception.cpp
index 177b3f4f84..4ded329ea1 100644
--- a/src/xbt/exception.cpp
+++ b/src/xbt/exception.cpp
@@ -11,6 +11,7 @@
 #include <boost/core/demangle.hpp>
 #include <mutex>
 #include <sstream>
+#include <typeinfo>
 
 XBT_LOG_EXTERNAL_CATEGORY(xbt);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_exception, xbt, "Exceptions");
-- 
2.20.1