From: Arnaud Giersch Date: Tue, 26 Oct 2021 20:07:16 +0000 (+0200) Subject: Move smpi_replay.hpp in private section. X-Git-Tag: v3.30~302 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1f7b8e8c82729f1d274419748e04fcca6b909d3b Move smpi_replay.hpp in private section. Rationale: includes private smpi_actor.hpp. --- diff --git a/MANIFEST.in b/MANIFEST.in index 1f37766a65..5669064fdb 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2087,7 +2087,6 @@ include include/simgrid/semaphore.h include include/simgrid/simdag.h include include/simgrid/simix.h include include/simgrid/simix.hpp -include include/simgrid/smpi/smpi_replay.hpp include include/simgrid/version.h.in include include/simgrid/vm.h include include/simgrid/zone.h @@ -2586,6 +2585,7 @@ include src/smpi/include/smpi_host.hpp include src/smpi/include/smpi_info.hpp include src/smpi/include/smpi_keyvals.hpp include src/smpi/include/smpi_op.hpp +include src/smpi/include/smpi_replay.hpp include src/smpi/include/smpi_request.hpp include src/smpi/include/smpi_status.hpp include src/smpi/include/smpi_topo.hpp diff --git a/include/simgrid/smpi/smpi_replay.hpp b/src/smpi/include/smpi_replay.hpp similarity index 99% rename from include/simgrid/smpi/smpi_replay.hpp rename to src/smpi/include/smpi_replay.hpp index c15f27363d..2f65fd33ec 100644 --- a/include/simgrid/smpi/smpi_replay.hpp +++ b/src/smpi/include/smpi_replay.hpp @@ -5,12 +5,11 @@ #ifndef SMPI_REPLAY_HPP_ #define SMPI_REPLAY_HPP_ -#include "src/smpi/include/smpi_actor.hpp" +#include "smpi_actor.hpp" +#include "xbt/ex.h" +#include "xbt/replay.hpp" #include -#include -#include - #include #include diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index e3d19a0774..42bbacdff4 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -3,16 +3,16 @@ /* 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 "smpi_replay.hpp" +#include "simgrid/s4u/Exec.hpp" #include "smpi_coll.hpp" #include "smpi_comm.hpp" +#include "smpi_config.hpp" #include "smpi_datatype.hpp" #include "smpi_group.hpp" #include "smpi_request.hpp" -#include "smpi_config.hpp" -#include "simgrid/s4u/Exec.hpp" +#include "src/smpi/include/private.hpp" #include "xbt/replay.hpp" -#include -#include #include #include diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 8a6ad66d6c..dae8efab6e 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -124,6 +124,7 @@ set(SMPI_SRC src/smpi/include/smpi_info.hpp src/smpi/include/smpi_keyvals.hpp src/smpi/include/smpi_op.hpp + src/smpi/include/smpi_replay.hpp src/smpi/include/smpi_request.hpp src/smpi/include/smpi_status.hpp src/smpi/include/smpi_topo.hpp @@ -684,7 +685,6 @@ set(headers_to_install include/simgrid/plugins/live_migration.h include/simgrid/plugins/load.h include/simgrid/plugins/ProducerConsumer.hpp - include/simgrid/smpi/smpi_replay.hpp include/simgrid/instr.h include/simgrid/mailbox.h include/simgrid/simdag.h