From 5328ea4927b5a641a4237e44502fcb5c27e5ddbf Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 14 Mar 2017 13:55:26 +0100
Subject: [PATCH] correct/remove include of rename xbt/replay.h

---
 examples/s4u/actions-comm/s4u_actions-comm.cpp | 2 +-
 src/smpi/colls/reduce_scatter-ompi.cpp         | 1 -
 src/smpi/smpi_base.cpp                         | 5 -----
 src/smpi/smpi_datatype.cpp                     | 1 -
 src/smpi/smpi_request.cpp                      | 1 -
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/examples/s4u/actions-comm/s4u_actions-comm.cpp b/examples/s4u/actions-comm/s4u_actions-comm.cpp
index 916bc726eb..0e95a452b5 100644
--- a/examples/s4u/actions-comm/s4u_actions-comm.cpp
+++ b/examples/s4u/actions-comm/s4u_actions-comm.cpp
@@ -7,8 +7,8 @@
 
 #include "simgrid/msg.h"
 #include "simgrid/simix.h"      /* semaphores for the barrier */
-#include <xbt/replay.h>
 #include "simgrid/s4u.hpp"
+#include "xbt/replay.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(actions, "Messages specific for this msg example");
 int communicator_size = 0;
diff --git a/src/smpi/colls/reduce_scatter-ompi.cpp b/src/smpi/colls/reduce_scatter-ompi.cpp
index ca49ba0b6d..0afa9b72cc 100644
--- a/src/smpi/colls/reduce_scatter-ompi.cpp
+++ b/src/smpi/colls/reduce_scatter-ompi.cpp
@@ -23,7 +23,6 @@
 
 #include "colls_private.h"
 #include "coll_tuned_topo.h"
-#include "xbt/replay.h"
 
 /*
  * Recursive-halving function is (*mostly*) copied from the BASIC coll module.
diff --git a/src/smpi/smpi_base.cpp b/src/smpi/smpi_base.cpp
index 712fec3ad7..27d4471fce 100644
--- a/src/smpi/smpi_base.cpp
+++ b/src/smpi/smpi_base.cpp
@@ -10,7 +10,6 @@
 #include "xbt/virtu.h"
 #include "mc/mc.h"
 #include "src/mc/mc_replay.h"
-#include "xbt/replay.h"
 #include <errno.h>
 #include "src/simix/smx_private.h"
 #include "surf/surf.h"
@@ -23,7 +22,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi, "Logging specific to SMPI (base)");
 
-
 static simgrid::config::Flag<double> smpi_wtime_sleep(
   "smpi/wtime", "Minimum time to inject inside a call to MPI_Wtime", 0.0);
 static simgrid::config::Flag<double> smpi_init_sleep(
@@ -54,7 +52,6 @@ double smpi_mpi_wtime(){
   return time;
 }
 
-
 void smpi_mpi_bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm)
 {
   smpi_coll_tuned_bcast_binomial_tree(buf, count, datatype, root, comm);
@@ -523,5 +520,3 @@ int smpi_mpi_get_count(MPI_Status * status, MPI_Datatype datatype)
 {
   return status->count / datatype->size();
 }
-
-
diff --git a/src/smpi/smpi_datatype.cpp b/src/smpi/smpi_datatype.cpp
index 865de31f4f..877b40eaf9 100644
--- a/src/smpi/smpi_datatype.cpp
+++ b/src/smpi/smpi_datatype.cpp
@@ -8,7 +8,6 @@
 #include "mc/mc.h"
 #include "private.h"
 #include "simgrid/modelchecker.h"
-#include "xbt/replay.h"
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/smpi/smpi_request.cpp b/src/smpi/smpi_request.cpp
index 1a5dcf5469..46012d70f6 100644
--- a/src/smpi/smpi_request.cpp
+++ b/src/smpi/smpi_request.cpp
@@ -8,7 +8,6 @@
 #include <algorithm>
 
 #include "private.h"
-#include "xbt/replay.h"
 #include "mc/mc.h"
 #include "src/mc/mc_replay.h"
 #include "src/simix/smx_private.h"
-- 
2.20.1