Merge conflicts in instr_routing.c

[simgrid.git] / src / smpi / smpi_mpi.c

diff --git a/src/smpi/smpi_mpi.c b/src/smpi/smpi_mpi.c
index d86fcd8..483bbf5 100644 (file)
--- a/src/smpi/smpi_mpi.c
+++ b/src/smpi/smpi_mpi.c
@@ -46,6 +46,11 @@ double MPI_Wtime(void)
   return PMPI_Wtime();
 }
 
+double MPI_Wtick(void)
+{
+  return PMPI_Wtick();
+}
+
 int MPI_Address(void *location, MPI_Aint * address)
 {
   return PMPI_Address(location, address);