From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 13 Apr 2018 21:14:41 +0000 (+0200)
Subject: make sure that simgrid/s4u/forward.hpp is loaded from only one file
X-Git-Tag: v3.20~427
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ea08504776a7b5b76f57bfee434b43ed572ca9f1

make sure that simgrid/s4u/forward.hpp is loaded from only one file
---

diff --git a/examples/s4u/exec-async/s4u-exec-async.cpp b/examples/s4u/exec-async/s4u-exec-async.cpp
index 2b6c83725c..0f4c4a0c3e 100644
--- a/examples/s4u/exec-async/s4u-exec-async.cpp
+++ b/examples/s4u/exec-async/s4u-exec-async.cpp
@@ -4,8 +4,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/s4u.hpp"
-#include "simgrid/forward.h"
-#include "simgrid/s4u/forward.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
 
diff --git a/examples/s4u/exec-monitor/s4u-exec-monitor.cpp b/examples/s4u/exec-monitor/s4u-exec-monitor.cpp
index be0022bd54..994ec37ec1 100644
--- a/examples/s4u/exec-monitor/s4u-exec-monitor.cpp
+++ b/examples/s4u/exec-monitor/s4u-exec-monitor.cpp
@@ -4,9 +4,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/s4u.hpp"
-#include "simgrid/forward.h"
-#include "simgrid/s4u/VirtualMachine.hpp"
-#include "simgrid/s4u/forward.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
 
diff --git a/examples/s4u/exec-remote/s4u-exec-remote.cpp b/examples/s4u/exec-remote/s4u-exec-remote.cpp
index 1cb60a8fce..292aefb4d4 100644
--- a/examples/s4u/exec-remote/s4u-exec-remote.cpp
+++ b/examples/s4u/exec-remote/s4u-exec-remote.cpp
@@ -4,8 +4,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/s4u.hpp"
-#include "simgrid/forward.h"
-#include "simgrid/s4u/forward.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
 
diff --git a/include/simgrid/host.h b/include/simgrid/host.h
index 75aceb87ed..44b38960ab 100644
--- a/include/simgrid/host.h
+++ b/include/simgrid/host.h
@@ -6,11 +6,8 @@
 #ifndef SIMGRID_HOST_H_
 #define SIMGRID_HOST_H_
 
-#include <stddef.h>
-
 #include <xbt/dict.h>
 #include <xbt/dynar.h>
-
 #include <simgrid/forward.h>
 
 SG_BEGIN_DECL()
diff --git a/include/simgrid/instr.h b/include/simgrid/instr.h
index dcf444eba9..2b3336b088 100644
--- a/include/simgrid/instr.h
+++ b/include/simgrid/instr.h
@@ -7,7 +7,6 @@
 #define INSTR_H_
 
 #include <simgrid/msg.h>
-#include <xbt.h>
 
 SG_BEGIN_DECL()
 
diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 6e808b503a..74d1edb8c8 100644
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -14,9 +14,7 @@
 #include <simgrid/storage.h>
 #include <simgrid/vm.h>
 #include <simgrid/zone.h>
-#include <xbt/base.h>
-#include <xbt/dict.h>
-#include <xbt/dynar.h>
+#include <xbt.h>
 
 #ifdef __cplusplus
 #include <map>
diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp
index 38781d5b0f..b91347cb16 100644
--- a/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@ -6,7 +6,6 @@
 #ifndef SIMGRID_S4U_ACTIVITY_HPP
 #define SIMGRID_S4U_ACTIVITY_HPP
 
-#include <simgrid/s4u/forward.hpp>
 #include <simgrid/forward.h>
 
 namespace simgrid {
diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp
index eb1c8f9c09..083b80fdc9 100644
--- a/include/simgrid/s4u/Host.hpp
+++ b/include/simgrid/s4u/Host.hpp
@@ -7,13 +7,11 @@
 #define SIMGRID_S4U_HOST_HPP
 
 #include <simgrid/forward.h>
-#include <simgrid/s4u/forward.hpp>
 #include <xbt/Extendable.hpp>
 #include <xbt/signal.hpp>
 #include <xbt/string.hpp>
 
 #include <map>
-#include <string>
 #include <unordered_map>
 
 namespace simgrid {
diff --git a/include/simgrid/s4u/Mailbox.hpp b/include/simgrid/s4u/Mailbox.hpp
index f27b582a5b..34326a70b1 100644
--- a/include/simgrid/s4u/Mailbox.hpp
+++ b/include/simgrid/s4u/Mailbox.hpp
@@ -6,14 +6,11 @@
 #ifndef SIMGRID_S4U_MAILBOX_HPP
 #define SIMGRID_S4U_MAILBOX_HPP
 
-#include <string>
-
-#include <xbt/base.h>
 #include <xbt/string.hpp>
-
-#include <simgrid/s4u/forward.hpp>
 #include <simgrid/s4u/Actor.hpp>
 
+#include <string>
+
 namespace simgrid {
 namespace s4u {
 
diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index 13e8780f35..4fea672f9c 100644
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -6,20 +6,15 @@
 #ifndef SIMGRID_S4U_NETZONE_HPP
 #define SIMGRID_S4U_NETZONE_HPP
 
+#include <simgrid/forward.h>
+#include <xbt/signal.hpp>
+
 #include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include <xbt/base.h>
-#include <xbt/graph.h>
-#include <xbt/signal.hpp>
-
-#include <simgrid/forward.h>
-#include <simgrid/s4u/forward.hpp>
-
 namespace simgrid {
-
 namespace s4u {
 
 /** @brief Networking Zones
diff --git a/include/simgrid/s4u/Storage.hpp b/include/simgrid/s4u/Storage.hpp
index 379648d5ae..d8386ffcac 100644
--- a/include/simgrid/s4u/Storage.hpp
+++ b/include/simgrid/s4u/Storage.hpp
@@ -6,8 +6,7 @@
 #ifndef INCLUDE_SIMGRID_S4U_STORAGE_HPP_
 #define INCLUDE_SIMGRID_S4U_STORAGE_HPP_
 
-#include <simgrid/s4u/forward.hpp>
-#include <simgrid/simix.h>
+#include <simgrid/forward.h>
 #include <xbt/Extendable.hpp>
 #include <xbt/base.h>
 
diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index 89063d55fb..a228732ad1 100644
--- a/include/simgrid/s4u/VirtualMachine.hpp
+++ b/include/simgrid/s4u/VirtualMachine.hpp
@@ -7,7 +7,6 @@
 #define SIMGRID_S4U_VM_HPP
 
 #include <simgrid/s4u/Host.hpp>
-#include <simgrid/s4u/forward.hpp>
 
 enum e_surf_vm_state_t {
   SURF_VM_STATE_CREATED, /**< created, but not yet started */
diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp
index 1fc73f183b..313ba4e046 100644
--- a/src/kernel/EngineImpl.hpp
+++ b/src/kernel/EngineImpl.hpp
@@ -3,9 +3,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 <map>
 #include <simgrid/s4u/NetZone.hpp>
-#include <simgrid/s4u/forward.hpp>
+
+#include <map>
 #include <string>
 #include <unordered_map>
 
diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index edfc750a82..b63c336da8 100644
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -5,26 +5,17 @@
 
 #include "SmpiHost.hpp"
 #include "mc/mc.h"
-#include "private.hpp"
 #include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/Mailbox.hpp"
-#include "simgrid/s4u/forward.hpp"
 #include "smpi_coll.hpp"
-#include "smpi_comm.hpp"
-#include "smpi_group.hpp"
-#include "smpi_info.hpp"
 #include "smpi_process.hpp"
 #include "src/msg/msg_private.hpp"
 #include "src/simix/smx_private.hpp"
-#include "src/surf/surf_interface.hpp"
 #include "xbt/config.hpp"
 
 #include <cfloat> /* DBL_MAX */
 #include <dlfcn.h>
 #include <fcntl.h>
 #include <fstream>
-#include <sys/stat.h>
 
 #if HAVE_SENDFILE
 #include <sys/sendfile.h>
@@ -50,8 +41,8 @@ struct papi_process_data {
   papi_counter_t counter_data;
   int event_set;
 };
-
 #endif
+
 using simgrid::s4u::Actor;
 using simgrid::s4u::ActorPtr;
 std::unordered_map<std::string, double> location2speedup;
diff --git a/src/smpi/internals/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp
index e391eee9c0..91fe28a5a8 100644
--- a/src/smpi/internals/smpi_process.cpp
+++ b/src/smpi/internals/smpi_process.cpp
@@ -5,10 +5,7 @@
 
 #include "smpi_process.hpp"
 #include "mc/mc.h"
-#include "private.hpp"
-#include "simgrid/s4u/forward.hpp"
 #include "smpi_comm.hpp"
-#include "smpi_group.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/msg/msg_private.hpp"
 #include "src/simix/smx_private.hpp"