summaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-09-19 20:50:49 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-09-19 20:50:49 (GMT)
commita6930a2bcfd37ea3610baafb608faec883286315 (patch)
tree0f2bd1f9463c2b0dfb9a6cfe6b79feefcf7505e1 /tools/lib
parent911b1ca67fdf7c2f3a32dd42c591e4e9b2fa1950 (diff)
downloadhdf5-a6930a2bcfd37ea3610baafb608faec883286315.zip
hdf5-a6930a2bcfd37ea3610baafb608faec883286315.tar.gz
hdf5-a6930a2bcfd37ea3610baafb608faec883286315.tar.bz2
Renamed get/set_time() calls in the tools library to avoid name
clash when building static parallel HDF5 w/ static linking to OpenMPI.
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/io_timer.c13
-rw-r--r--tools/lib/io_timer.h4
2 files changed, 10 insertions, 7 deletions
diff --git a/tools/lib/io_timer.c b/tools/lib/io_timer.c
index a6885df..cb89019 100644
--- a/tools/lib/io_timer.c
+++ b/tools/lib/io_timer.c
@@ -123,17 +123,17 @@ get_timer_type(io_time_t *pt)
#endif
/*
- * Function: set_time
+ * Function: io_time_set
* Purpose: Set the time in a ``io_time_t'' object.
* Return: Pointer to the passed in ``io_time_t'' object if SUCCEED; Null otherwise.
* Programmer: Bill Wendling, 01. October 2001
* Modifications:
*/
io_time_t *
-set_time(io_time_t *pt, timer_type t, int start_stop)
+io_time_set(io_time_t *pt, timer_type t, int start_stop)
{
/* sanity check */
- assert(pt);
+ HDassert(pt);
switch(pt->type){
#ifdef H5_HAVE_PARALLEL
@@ -207,15 +207,18 @@ set_time(io_time_t *pt, timer_type t, int start_stop)
}
/*
- * Function: get_time
+ * Function: io_time_get
* Purpose: Get the time from a ``io_time_t'' object.
* Return: The number of seconds as a DOUBLE.
* Programmer: Bill Wendling, 01. October 2001
* Modifications:
*/
H5_ATTR_PURE double
-get_time(io_time_t *pt, timer_type t)
+io_time_get(io_time_t *pt, timer_type t)
{
+ /* sanity check */
+ HDassert(pt);
+
return pt->total_time[t];
}
diff --git a/tools/lib/io_timer.h b/tools/lib/io_timer.h
index 48b6c87..78bf676 100644
--- a/tools/lib/io_timer.h
+++ b/tools/lib/io_timer.h
@@ -72,8 +72,8 @@ extern "C" {
#endif /* __cplusplus */
H5TOOLS_DLL io_time_t *io_time_new(clock_type t);
H5TOOLS_DLL void io_time_destroy(io_time_t *pt);
-H5TOOLS_DLL io_time_t *set_time(io_time_t *pt, timer_type t, int start_stop);
-H5TOOLS_DLL double get_time(io_time_t *pt, timer_type t);
+H5TOOLS_DLL io_time_t *io_time_set(io_time_t *pt, timer_type t, int start_stop);
+H5TOOLS_DLL double io_time_get(io_time_t *pt, timer_type t);
#ifdef __cplusplus
}
#endif /* __cplusplus */