From: Augustin Degomme <augustin.degomme@imag.fr>
Date: Wed, 16 Jul 2014 15:44:00 +0000 (+0200)
Subject: rename function
X-Git-Tag: v3_12~896^2~1
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dd3f7131fa6fb84ae9a070c8574ad1f3c0e1611d

rename function
---

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 4c682d746a..8e9ce16fdf 100644
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -174,7 +174,7 @@ void print_request(const char *message, MPI_Request request);
 int smpi_enabled(void);
 void smpi_global_init(void);
 void smpi_global_destroy(void);
-double smpi_wtime(void);
+double smpi_mpi_wtime(void);
 
 int is_datatype_valid(MPI_Datatype datatype);
 
diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 15ca6090f1..3ea6ac248c 100644
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -190,7 +190,7 @@ static double smpi_or(double size)
   return current;
 }
 
-double smpi_wtime(){
+double smpi_mpi_wtime(){
   double time;
   if (smpi_process_initialized() && !smpi_process_finalized() && !smpi_process_get_sampling()) {
     smpi_bench_end();
diff --git a/src/smpi/smpi_pmpi.c b/src/smpi/smpi_pmpi.c
index 8659ec4047..4d8e218ed6 100644
--- a/src/smpi/smpi_pmpi.c
+++ b/src/smpi/smpi_pmpi.c
@@ -127,7 +127,7 @@ int PMPI_Abort(MPI_Comm comm, int errorcode)
 
 double PMPI_Wtime(void)
 {
-  return smpi_wtime();
+  return smpi_mpi_wtime();
 }
 
 extern double sg_maxmin_precision;