From 8cb54d14b2c312911cc049247c702cffb48131cc Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Mon, 22 Feb 2021 11:16:30 +0100
Subject: [PATCH] Rename: include/simgrid/smpi/{replay.hpp => smpi_replay.hpp}.

Rationale: avoid confusion with include/xbt/replay.hpp in coverage measures.
---
 MANIFEST.in                                          | 2 +-
 include/simgrid/smpi/{replay.hpp => smpi_replay.hpp} | 4 ++--
 src/smpi/internals/smpi_replay.cpp                   | 2 +-
 tools/cmake/DefinePackages.cmake                     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename include/simgrid/smpi/{replay.hpp => smpi_replay.hpp} (99%)

diff --git a/MANIFEST.in b/MANIFEST.in
index 60e4456623..431acaabcd 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2015,7 +2015,7 @@ include include/simgrid/simdag.h
 include include/simgrid/simix.h
 include include/simgrid/simix.hpp
 include include/simgrid/simix/blocking_simcall.hpp
-include include/simgrid/smpi/replay.hpp
+include include/simgrid/smpi/smpi_replay.hpp
 include include/simgrid/version.h.in
 include include/simgrid/vm.h
 include include/simgrid/zone.h
diff --git a/include/simgrid/smpi/replay.hpp b/include/simgrid/smpi/smpi_replay.hpp
similarity index 99%
rename from include/simgrid/smpi/replay.hpp
rename to include/simgrid/smpi/smpi_replay.hpp
index b37c63d651..cdc53f1f30 100644
--- a/include/simgrid/smpi/replay.hpp
+++ b/include/simgrid/smpi/smpi_replay.hpp
@@ -8,8 +8,8 @@
 #include "src/smpi/include/smpi_actor.hpp"
 
 #include <boost/algorithm/string/join.hpp>
-#include <xbt/replay.hpp>
 #include <xbt/ex.h>
+#include <xbt/replay.hpp>
 
 #include <memory>
 #include <sstream>
@@ -101,7 +101,7 @@ public:
   double comp_size;
   int send_size;
   int recv_size;
-  int root = 0;
+  int root               = 0;
   MPI_Datatype datatype1 = MPI_DEFAULT_TYPE;
   MPI_Datatype datatype2 = MPI_DEFAULT_TYPE;
 };
diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp
index 21951bad72..39d74ef3c9 100644
--- a/src/smpi/internals/smpi_replay.cpp
+++ b/src/smpi/internals/smpi_replay.cpp
@@ -9,7 +9,7 @@
 #include "smpi_group.hpp"
 #include "smpi_request.hpp"
 #include "xbt/replay.hpp"
-#include <simgrid/smpi/replay.hpp>
+#include <simgrid/smpi/smpi_replay.hpp>
 #include <src/smpi/include/private.hpp>
 
 #include <memory>
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 9b9a7014bd..d66369ac1f 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -680,7 +680,7 @@ set(headers_to_install
   include/simgrid/plugins/file_system.h
   include/simgrid/plugins/live_migration.h
   include/simgrid/plugins/load.h
-  include/simgrid/smpi/replay.hpp
+  include/simgrid/smpi/smpi_replay.hpp
   include/simgrid/instr.h
   include/simgrid/mailbox.h
   include/simgrid/simdag.h
-- 
2.20.1