Reduce the amount of header files loading xbt/string.hpp

Prefer to load this file from the source files (as usual) to reduce
the amount of files to be rebuilt when this file changes.

diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index 199ac80..bcfad93 100644 (file)
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -11,7 +11,6 @@
 #include <simgrid/chrono.hpp>
 #include <xbt/Extendable.hpp>
 #include <xbt/signal.hpp>
-#include <xbt/string.hpp>
 
 #include <functional>
 #include <unordered_map>

diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp
index bae7f73..c96f51b 100644 (file)
--- a/include/simgrid/s4u/Host.hpp
+++ b/include/simgrid/s4u/Host.hpp
@@ -9,7 +9,6 @@
 #include <simgrid/forward.h>
 #include <xbt/Extendable.hpp>
 #include <xbt/signal.hpp>
-#include <xbt/string.hpp>
 
 #include <map>
 #include <unordered_map>

diff --git a/src/kernel/activity/BarrierImpl.hpp b/src/kernel/activity/BarrierImpl.hpp
index 7d72f6b..ed69576 100644 (file)
--- a/src/kernel/activity/BarrierImpl.hpp
+++ b/src/kernel/activity/BarrierImpl.hpp
@@ -10,6 +10,7 @@
 #include "src/kernel/activity/ActivityImpl.hpp"
 #include "src/kernel/actor/ActorImpl.hpp"
 #include "src/kernel/actor/SynchroObserver.hpp"
+#include "xbt/string.hpp"
 
 namespace simgrid::kernel::activity {
 /** Barrier Acquisition: the act / process of acquiring the barrier.

diff --git a/src/kernel/resource/WifiLinkImpl.hpp b/src/kernel/resource/WifiLinkImpl.hpp
index 811734d..3036606 100644 (file)
--- a/src/kernel/resource/WifiLinkImpl.hpp
+++ b/src/kernel/resource/WifiLinkImpl.hpp
@@ -6,10 +6,8 @@
 #ifndef SURF_NETWORK_WIFI_HPP_
 #define SURF_NETWORK_WIFI_HPP_
 
-#include <xbt/base.h>
-
 #include "src/surf/network_cm02.hpp"
-#include "xbt/string.hpp"
+#include "xbt/base.h"
 
 /***********
  * Classes *

diff --git a/src/mc/explo/CommunicationDeterminismChecker.cpp b/src/mc/explo/CommunicationDeterminismChecker.cpp
index 031416a..31e1159 100644 (file)
--- a/src/mc/explo/CommunicationDeterminismChecker.cpp
+++ b/src/mc/explo/CommunicationDeterminismChecker.cpp
@@ -11,6 +11,7 @@
 #include "src/mc/mc_private.hpp"
 #include "src/mc/transition/TransitionAny.hpp"
 #include "src/mc/transition/TransitionComm.hpp"
+#include "xbt/string.hpp"
 
 #include <cstdint>
 

diff --git a/src/mc/explo/DFSExplorer.cpp b/src/mc/explo/DFSExplorer.cpp
index 3af39bc..56c734a 100644 (file)
--- a/src/mc/explo/DFSExplorer.cpp
+++ b/src/mc/explo/DFSExplorer.cpp
@@ -13,6 +13,7 @@
 
 #include "src/xbt/mmalloc/mmprivate.h"
 #include "xbt/log.h"
+#include "xbt/string.hpp"
 #include "xbt/sysdep.h"
 
 #include <cassert>

diff --git a/src/mc/transition/TransitionActorJoin.cpp b/src/mc/transition/TransitionActorJoin.cpp
index 2f4b017..cc1bcd6 100644 (file)
--- a/src/mc/transition/TransitionActorJoin.cpp
+++ b/src/mc/transition/TransitionActorJoin.cpp
@@ -4,8 +4,9 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/mc/transition/TransitionActorJoin.hpp"
+#include "simgrid/config.h"
 #include "xbt/asserts.h"
-#include <simgrid/config.h>
+#include "xbt/string.hpp"
 #if SIMGRID_HAVE_MC
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/api/RemoteApp.hpp"

diff --git a/src/mc/transition/TransitionAny.cpp b/src/mc/transition/TransitionAny.cpp
index 9de469b..0be0a04 100644 (file)
--- a/src/mc/transition/TransitionAny.cpp
+++ b/src/mc/transition/TransitionAny.cpp
@@ -4,8 +4,9 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/mc/transition/TransitionAny.hpp"
+#include "simgrid/config.h"
 #include "xbt/asserts.h"
-#include <simgrid/config.h>
+#include "xbt/string.hpp"
 #if SIMGRID_HAVE_MC
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/api/RemoteApp.hpp"

diff --git a/src/mc/transition/TransitionComm.cpp b/src/mc/transition/TransitionComm.cpp
index a25b10a..9a332e2 100644 (file)
--- a/src/mc/transition/TransitionComm.cpp
+++ b/src/mc/transition/TransitionComm.cpp
@@ -4,8 +4,9 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/mc/transition/TransitionComm.hpp"
+#include "simgrid/config.h"
 #include "xbt/asserts.h"
-#include <simgrid/config.h>
+#include "xbt/string.hpp"
 #if SIMGRID_HAVE_MC
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/api/RemoteApp.hpp"

diff --git a/src/smpi/colls/allgather/allgather-SMP-NTS.cpp b/src/smpi/colls/allgather/allgather-SMP-NTS.cpp
index 2656955..b99b08b 100644 (file)
--- a/src/smpi/colls/allgather/allgather-SMP-NTS.cpp
+++ b/src/smpi/colls/allgather/allgather-SMP-NTS.cpp
@@ -5,6 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "../colls_private.hpp"
+#include "xbt/string.hpp"
 
 namespace simgrid::smpi {
 

diff --git a/src/smpi/colls/allgather/allgather-loosely-lr.cpp b/src/smpi/colls/allgather/allgather-loosely-lr.cpp
index 67debf5..5281cc1 100644 (file)
--- a/src/smpi/colls/allgather/allgather-loosely-lr.cpp
+++ b/src/smpi/colls/allgather/allgather-loosely-lr.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2013-2022. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2022. The SimGrid Team. All rights reserved.          */
 
 /* 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 "../colls_private.hpp"
+#include "xbt/string.hpp"
 
 namespace simgrid::smpi {
 

diff --git a/src/smpi/colls/allgather/allgather-smp-simple.cpp b/src/smpi/colls/allgather/allgather-smp-simple.cpp
index e69e2e8..cf4abb9 100644 (file)
--- a/src/smpi/colls/allgather/allgather-smp-simple.cpp
+++ b/src/smpi/colls/allgather/allgather-smp-simple.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2013-2022. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2022. The SimGrid Team. All rights reserved.          */
 
 /* 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 "../colls_private.hpp"
+#include "xbt/string.hpp"
 
 namespace simgrid::smpi {
 

diff --git a/src/sthread/sthread_impl.cpp b/src/sthread/sthread_impl.cpp
index efcdcdd..5ec2a04 100644 (file)
--- a/src/sthread/sthread_impl.cpp
+++ b/src/sthread/sthread_impl.cpp
@@ -1,6 +1,7 @@
 /* SimGrid's pthread interposer. Actual implementation of the symbols (see the comment in sthread.h) */
 
 #include "smpi/smpi.h"
+#include "xbt/string.hpp"
 #include <simgrid/actor.h>
 #include <simgrid/s4u/Actor.hpp>
 #include <simgrid/s4u/Engine.hpp>

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 6025e13..5ba4fa5 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -6,12 +6,9 @@
 #ifndef SURF_NETWORK_CM02_HPP_
 #define SURF_NETWORK_CM02_HPP_
 
-#include <xbt/base.h>
-
 #include "src/kernel/resource/NetworkModel.hpp"
 #include "src/kernel/resource/StandardLinkImpl.hpp"
-#include "xbt/graph.h"
-#include "xbt/string.hpp"
+#include "xbt/base.h"
 
 /***********
  * Classes *