Don't include <xbt/functional.hpp> when it's not needed.

This aims to reduce the need for C++14 in user codes.

diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index 10538605d737fbc253e92cf1c44fedf25c3e230e..b72b576f1cc931d6587e4eee02d383acd0f791a9 100644 (file)
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -10,7 +10,6 @@
 
 #include <simgrid/chrono.hpp>
 #include <xbt/Extendable.hpp>
 
 #include <simgrid/chrono.hpp>
 #include <xbt/Extendable.hpp>

-#include <xbt/functional.hpp>

 #include <xbt/signal.hpp>
 #include <xbt/string.hpp>
 
 #include <xbt/signal.hpp>
 #include <xbt/string.hpp>
 

diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp
index 086849f43a51c873a12dc7a078f8f804cb2e8b3b..141cd5d02a6a0a6770f341f149c144273efce72e 100644 (file)
--- a/include/simgrid/s4u/Engine.hpp
+++ b/include/simgrid/s4u/Engine.hpp
@@ -7,10 +7,8 @@
 #define SIMGRID_S4U_ENGINE_HPP
 
 #include <xbt/base.h>
 #define SIMGRID_S4U_ENGINE_HPP
 
 #include <xbt/base.h>

-#include <xbt/functional.hpp>

 
 #include <simgrid/forward.h>
 
 #include <simgrid/forward.h>

-#include <simgrid/simix.hpp>

 
 #include <simgrid/s4u/NetZone.hpp>
 
 
 #include <simgrid/s4u/NetZone.hpp>
 

diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index 749b0a7188641e6edc81d1736cea1079eedee10d..c9045ad713d38934b58a4eb64feca3c808367607 100644 (file)
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -7,7 +7,7 @@
 #define SIMGRID_SIMIX_H
 
 #include <simgrid/forward.h>
 #define SIMGRID_SIMIX_H
 
 #include <simgrid/forward.h>

-#include <simgrid/host.h>
+#include <xbt/dynar.h>

 #include <xbt/ex.h>
 #include <xbt/parmap.h>
 #ifdef __cplusplus
 #include <xbt/ex.h>
 #include <xbt/parmap.h>
 #ifdef __cplusplus

diff --git a/src/bindings/lua/lua_host.cpp b/src/bindings/lua/lua_host.cpp
index 05baee23a8bff1dc4458162dd6311f6f6d28858b..66861f2768392b971667f49bf64067ad654ad872 100644 (file)
--- a/src/bindings/lua/lua_host.cpp
+++ b/src/bindings/lua/lua_host.cpp
@@ -8,6 +8,7 @@
 #include "lua_private.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "lua_private.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"

+#include "xbt/asserts.h"

 #include <lauxlib.h>
 
 constexpr char HOST_MODULE_NAME[] = "simgrid.host";
 #include <lauxlib.h>
 
 constexpr char HOST_MODULE_NAME[] = "simgrid.host";

diff --git a/src/instr/instr_paje_events.hpp b/src/instr/instr_paje_events.hpp
index 74e63799d53839c7799fc0c20e08cf03ab440311..2527bd72668b7745d5eff7871690cbafd48eddea 100644 (file)
--- a/src/instr/instr_paje_events.hpp
+++ b/src/instr/instr_paje_events.hpp
@@ -8,6 +8,7 @@
 
 #include "src/instr/instr_private.hpp"
 #include "src/internal_config.h"
 
 #include "src/instr/instr_private.hpp"
 #include "src/internal_config.h"

+#include <memory>

 #include <sstream>
 #include <string>
 
 #include <sstream>
 #include <string>
 

diff --git a/src/kernel/routing/NetPoint.cpp b/src/kernel/routing/NetPoint.cpp
index 6ff888d333ded1f989c7b279a7cc16ebe345d7e3..77433ff7d8b5939d120d9045ca0b36fe5adc3ed1 100644 (file)
--- a/src/kernel/routing/NetPoint.cpp
+++ b/src/kernel/routing/NetPoint.cpp
@@ -6,6 +6,7 @@
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"

+#include "xbt/log.h"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
 

diff --git a/src/plugins/link_energy.cpp b/src/plugins/link_energy.cpp
index 23c4dde639770c80621cc0fb39c6e611ba0c40f2..a16cd8363c8763c8e3b22b90c5f1a59b549fab62 100644 (file)
--- a/src/plugins/link_energy.cpp
+++ b/src/plugins/link_energy.cpp
@@ -4,8 +4,10 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/Exception.hpp"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/Exception.hpp"

+#include "simgrid/host.h"

 #include "simgrid/plugins/energy.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/plugins/energy.h"
 #include "simgrid/s4u/Engine.hpp"

+#include "simgrid/simix.hpp"

 #include "src/surf/network_interface.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"

diff --git a/src/s4u/s4u_Disk.cpp b/src/s4u/s4u_Disk.cpp
index d75db462466fb05f2c332208a6a7e708b41c388d..e2fdecfaf704eaf97eba40b24ad36d0cda4d44e7 100644 (file)
--- a/src/s4u/s4u_Disk.cpp
+++ b/src/s4u/s4u_Disk.cpp
@@ -7,6 +7,7 @@
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Io.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Io.hpp"

+#include "simgrid/simix.hpp"

 #include "src/kernel/resource/DiskImpl.hpp"
 
 namespace simgrid {
 #include "src/kernel/resource/DiskImpl.hpp"
 
 namespace simgrid {

diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp
index 846790fadf2138dc2f73e61210c3f16a59f95737..ef68c799740debd2e435be2321d8abc1727de42f 100644 (file)
--- a/src/s4u/s4u_Host.cpp
+++ b/src/s4u/s4u_Host.cpp
@@ -3,6 +3,7 @@
 /* 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. */
 
 /* 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 "simgrid/host.h"

 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/Engine.hpp"

diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp
index 6109f664306a4c28243d0e4ef18cdede6eefd6ac..8ab5462637b409c9166aed79ce91e9b7fe295220 100644 (file)
--- a/src/s4u/s4u_Netzone.cpp
+++ b/src/s4u/s4u_Netzone.cpp
@@ -7,6 +7,7 @@
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/NetZone.hpp"

+#include "simgrid/simix.hpp"

 #include "simgrid/zone.h"
 
 namespace simgrid {
 #include "simgrid/zone.h"
 
 namespace simgrid {

diff --git a/src/s4u/s4u_Storage.cpp b/src/s4u/s4u_Storage.cpp
index dfd02fd22d49d6ea04777a5ae468f6e16b01b27d..0727b798818e7ac8fa7617d1332b270cc5d06580 100644 (file)
--- a/src/s4u/s4u_Storage.cpp
+++ b/src/s4u/s4u_Storage.cpp
@@ -7,6 +7,7 @@
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Io.hpp"
 #include "simgrid/s4u/Storage.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Io.hpp"
 #include "simgrid/s4u/Storage.hpp"

+#include "simgrid/simix.hpp"

 #include "simgrid/storage.h"
 #include "src/surf/StorageImpl.hpp"
 
 #include "simgrid/storage.h"
 #include "src/surf/StorageImpl.hpp"
 

diff --git a/src/simix/popping_generated.cpp b/src/simix/popping_generated.cpp
index 6d37c919577179cf86af5decbfb7a4967f79ac7c..179e262659dc453516a6a4894ab7a6f78f7f4f39 100644 (file)
--- a/src/simix/popping_generated.cpp
+++ b/src/simix/popping_generated.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "smx_private.hpp"
  */
 
 #include "smx_private.hpp"

+#include <simgrid/host.h>

 #include <xbt/base.h>
 #if SIMGRID_HAVE_MC
 #include "src/mc/mc_forward.hpp"
 #include <xbt/base.h>
 #if SIMGRID_HAVE_MC
 #include "src/mc/mc_forward.hpp"

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index a0803c9be832ff61e1fb76c6487dcb03f49f8063..77add25b637e286ea01482ebf465bd8f27c43573 100755 (executable)
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -314,6 +314,7 @@ if __name__ == '__main__':
     fd = header("popping_generated.cpp")
 
     fd.write('#include "smx_private.hpp"\n')
     fd = header("popping_generated.cpp")
 
     fd.write('#include "smx_private.hpp"\n')

+    fd.write('#include <simgrid/host.h>\n')

     fd.write('#include <xbt/base.h>\n')
     fd.write('#if SIMGRID_HAVE_MC\n')
     fd.write('#include "src/mc/mc_forward.hpp"\n')
     fd.write('#include <xbt/base.h>\n')
     fd.write('#if SIMGRID_HAVE_MC\n')
     fd.write('#include "src/mc/mc_forward.hpp"\n')

diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp
index 757d5ed212a26ec8892aa86bdf0bce8c8b8cf883..0c02db1011b84fcd03a26396c3b6a365d52e618b 100644 (file)
--- a/teshsuite/simdag/flatifier/flatifier.cpp
+++ b/teshsuite/simdag/flatifier/flatifier.cpp
@@ -12,6 +12,7 @@
 #include "src/surf/network_interface.hpp"
 
 #include <algorithm>
 #include "src/surf/network_interface.hpp"
 
 #include <algorithm>

+#include <cstring>

 
 XBT_LOG_NEW_DEFAULT_CATEGORY(flatifier, "Logging specific to this platform parsing tool");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(flatifier, "Logging specific to this platform parsing tool");
 

diff --git a/teshsuite/smpi/gh-139/gh-139.c b/teshsuite/smpi/gh-139/gh-139.c
index 4f504340e334966a4f909015510f75fa6a5047a3..645fad60f7d5555dbd6d9956f568a5c357dbed11 100644 (file)
--- a/teshsuite/smpi/gh-139/gh-139.c
+++ b/teshsuite/smpi/gh-139/gh-139.c
@@ -6,7 +6,7 @@
 
 #include <mpi.h>
 #include <simgrid/actor.h>
 
 #include <mpi.h>
 #include <simgrid/actor.h>

-#include <simgrid/simix.h>
+#include <simgrid/host.h>

 #include <stdio.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(smpi_test, "Messages specific for this SMPI example");
 #include <stdio.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(smpi_test, "Messages specific for this SMPI example");

diff --git a/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.cpp b/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.cpp
index 6a0af883027d6167f1237ce5a7b5ac6bb39a0ea8..eeb5d4de880f97d5f75a7cb3108866df0d7dc999 100644 (file)
--- a/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.cpp
+++ b/teshsuite/xbt/parallel_log_crashtest/parallel_log_crashtest.cpp
@@ -6,6 +6,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/s4u/Engine.hpp"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/s4u/Engine.hpp"

+#include "xbt/log.h"

 #include <array>
 #include <thread>
 
 #include <array>
 #include <thread>