From 3ac078ce1fa6cbc790255e34c7b187742664ef45 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Sun, 19 May 2019 10:50:01 +0200
Subject: [PATCH] make sure that nobody can compile s4u without
 simgrid/forward.h

---
 include/simgrid/s4u.hpp                   | 2 ++
 include/simgrid/s4u/Actor.hpp             | 9 ++++++---
 include/simgrid/s4u/ConditionVariable.hpp | 2 ++
 include/simgrid/s4u/Engine.hpp            | 8 ++++----
 include/simgrid/s4u/Link.hpp              | 1 +
 include/simgrid/s4u/Mailbox.hpp           | 4 +++-
 include/simgrid/s4u/VirtualMachine.hpp    | 1 +
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/include/simgrid/s4u.hpp b/include/simgrid/s4u.hpp
index d4c48295bc..dcbc463eb3 100644
--- a/include/simgrid/s4u.hpp
+++ b/include/simgrid/s4u.hpp
@@ -6,6 +6,8 @@
 #ifndef SIMGRID_S4U_S4U_H
 #define SIMGRID_S4U_S4U_H
 
+#include <simgrid/forward.h>
+
 #include <simgrid/s4u/Activity.hpp>
 #include <simgrid/s4u/Actor.hpp>
 #include <simgrid/s4u/Barrier.hpp>
diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index 8e48a17218..ebbc9c6f72 100644
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -6,15 +6,18 @@
 #ifndef SIMGRID_S4U_ACTOR_HPP
 #define SIMGRID_S4U_ACTOR_HPP
 
-#include <functional>
-#include <map> // deprecated wrappers
+#include <simgrid/forward.h>
+
 #include <simgrid/chrono.hpp>
-#include <unordered_map>
 #include <xbt/Extendable.hpp>
 #include <xbt/functional.hpp>
 #include <xbt/signal.hpp>
 #include <xbt/string.hpp>
 
+#include <functional>
+#include <map> // deprecated wrappers
+#include <unordered_map>
+
 namespace simgrid {
 namespace s4u {
 
diff --git a/include/simgrid/s4u/ConditionVariable.hpp b/include/simgrid/s4u/ConditionVariable.hpp
index 8e926fba92..523024d987 100644
--- a/include/simgrid/s4u/ConditionVariable.hpp
+++ b/include/simgrid/s4u/ConditionVariable.hpp
@@ -6,6 +6,8 @@
 #ifndef SIMGRID_S4U_COND_VARIABLE_HPP
 #define SIMGRID_S4U_COND_VARIABLE_HPP
 
+#include <simgrid/forward.h>
+
 #include <simgrid/chrono.hpp>
 #include <simgrid/s4u/Mutex.hpp>
 
diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp
index e13aceeaf5..941b7cde68 100644
--- a/include/simgrid/s4u/Engine.hpp
+++ b/include/simgrid/s4u/Engine.hpp
@@ -6,10 +6,6 @@
 #ifndef SIMGRID_S4U_ENGINE_HPP
 #define SIMGRID_S4U_ENGINE_HPP
 
-#include <string>
-#include <utility>
-#include <vector>
-
 #include <xbt/base.h>
 #include <xbt/functional.hpp>
 
@@ -18,6 +14,10 @@
 
 #include <simgrid/s4u/NetZone.hpp>
 
+#include <string>
+#include <utility>
+#include <vector>
+
 namespace simgrid {
 namespace s4u {
 /** @brief Simulation engine
diff --git a/include/simgrid/s4u/Link.hpp b/include/simgrid/s4u/Link.hpp
index 85b5e1ed06..bf34cc73c0 100644
--- a/include/simgrid/s4u/Link.hpp
+++ b/include/simgrid/s4u/Link.hpp
@@ -6,6 +6,7 @@
 #ifndef S4U_LINK_HPP_
 #define S4U_LINK_HPP_
 
+#include <simgrid/forward.h>
 #include <simgrid/kernel/resource/Action.hpp>
 #include <simgrid/link.h>
 #include <string>
diff --git a/include/simgrid/s4u/Mailbox.hpp b/include/simgrid/s4u/Mailbox.hpp
index faffc353ca..989ae54d3c 100644
--- a/include/simgrid/s4u/Mailbox.hpp
+++ b/include/simgrid/s4u/Mailbox.hpp
@@ -6,8 +6,10 @@
 #ifndef SIMGRID_S4U_MAILBOX_HPP
 #define SIMGRID_S4U_MAILBOX_HPP
 
-#include <xbt/string.hpp>
+#include <simgrid/forward.h>
+
 #include <simgrid/s4u/Actor.hpp>
+#include <xbt/string.hpp>
 
 #include <string>
 
diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index 1e5e5f34c2..5ea79167d2 100644
--- a/include/simgrid/s4u/VirtualMachine.hpp
+++ b/include/simgrid/s4u/VirtualMachine.hpp
@@ -6,6 +6,7 @@
 #ifndef SIMGRID_S4U_VM_HPP
 #define SIMGRID_S4U_VM_HPP
 
+#include <simgrid/forward.h>
 #include <simgrid/s4u/Host.hpp>
 
 namespace simgrid {
-- 
2.20.1