From 2513cd9f5055a6a62a7066685e7fca786bcf1966 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Tue, 8 Dec 2015 14:39:27 +0100
Subject: [PATCH] Add some missing #include

---
 include/simgrid/simix.hpp         | 3 +++
 src/bindings/java/JavaContext.cpp | 3 +++
 src/bindings/java/JavaContext.hpp | 2 ++
 src/simix/BoostContext.cpp        | 4 ++++
 src/simix/BoostContext.hpp        | 1 +
 src/simix/Context.cpp             | 7 ++++---
 src/simix/RawContext.cpp          | 3 +++
 src/simix/ThreadContext.cpp       | 3 +++
 src/simix/UContext.cpp            | 2 ++
 9 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index 3002a4bd58..1829bad3a3 100644
--- a/include/simgrid/simix.hpp
+++ b/include/simgrid/simix.hpp
@@ -7,6 +7,9 @@
 #ifndef SIMGRID_SIMIX_HPP
 #define SIMGRID_SIMIX_HPP
 
+#include <cstddef>
+
+#include <string>
 #include <utility>
 #include <memory>
 #include <functional>
diff --git a/src/bindings/java/JavaContext.cpp b/src/bindings/java/JavaContext.cpp
index 51ae35bcf9..586fd13194 100644
--- a/src/bindings/java/JavaContext.cpp
+++ b/src/bindings/java/JavaContext.cpp
@@ -6,6 +6,9 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <functional>
+#include <utility>
+
 #include <xbt/function_types.h>
 #include <simgrid/simix.h>
 #include <xbt/ex.h>
diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp
index 564938803b..dfbf821cdb 100644
--- a/src/bindings/java/JavaContext.hpp
+++ b/src/bindings/java/JavaContext.hpp
@@ -7,6 +7,8 @@
 #ifndef SIMGRID_JAVA_JAVA_CONTEXT_HPP
 #define SIMGRID_JAVA_JAVA_CONTEXT_HPP
 
+#include <functional>
+
 #include <jni.h>
 
 #include <xbt/misc.h>
diff --git a/src/simix/BoostContext.cpp b/src/simix/BoostContext.cpp
index aa35075887..b66da92761 100644
--- a/src/simix/BoostContext.cpp
+++ b/src/simix/BoostContext.cpp
@@ -8,6 +8,10 @@
 
 #include <cstdint>
 
+#include <functional>
+#include <utility>
+#include <vector>
+
 #include <boost/context/all.hpp>
 
 #include <xbt/log.h>
diff --git a/src/simix/BoostContext.hpp b/src/simix/BoostContext.hpp
index d558d74c7b..c2df0d11d5 100644
--- a/src/simix/BoostContext.hpp
+++ b/src/simix/BoostContext.hpp
@@ -10,6 +10,7 @@
 #ifndef SIMGRID_SIMIX_BOOST_CONTEXT_HPP
 #define SIMGRID_SIMIX_BOOST_CONTEXT_HPP
 
+#include <functional>
 #include <vector>
 
 #include <xbt/parmap.h>
diff --git a/src/simix/Context.cpp b/src/simix/Context.cpp
index e6eec95bd7..7115e3ab37 100644
--- a/src/simix/Context.cpp
+++ b/src/simix/Context.cpp
@@ -4,10 +4,11 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <vector>
-#include <string>
-#include <cstring>
+#include <cstdint>
+
 #include <memory>
+#include <functional>
+#include <utility>
 
 #include <simgrid/simix.hpp>
 
diff --git a/src/simix/RawContext.cpp b/src/simix/RawContext.cpp
index 8aefa7177e..31a950fc7a 100644
--- a/src/simix/RawContext.cpp
+++ b/src/simix/RawContext.cpp
@@ -13,6 +13,9 @@
 
 #include <math.h>
 
+#include <utility>
+#include <functional>
+
 #include <xbt/log.h>
 #include <xbt/parmap.h>
 #include <xbt/dynar.h>
diff --git a/src/simix/ThreadContext.cpp b/src/simix/ThreadContext.cpp
index de4e718feb..e676dc4ef2 100644
--- a/src/simix/ThreadContext.cpp
+++ b/src/simix/ThreadContext.cpp
@@ -4,6 +4,9 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <utility>
+#include <functional>
+
 #include "xbt/function_types.h"
 #include "smx_private.h"
 #include "src/portable.h"           /* loads context system definitions */
diff --git a/src/simix/UContext.cpp b/src/simix/UContext.cpp
index d2ce507b57..6014eca819 100644
--- a/src/simix/UContext.cpp
+++ b/src/simix/UContext.cpp
@@ -8,6 +8,8 @@
 
 #include <stdarg.h>
 
+#include <functional>
+
 #include "xbt/parmap.h"
 #include "smx_private.h"
 #include "smx_private.hpp"
-- 
2.20.1