summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Arber <larber@ncsa.uiuc.edu>2006-01-27 15:32:04 (GMT)
committerLeon Arber <larber@ncsa.uiuc.edu>2006-01-27 15:32:04 (GMT)
commit05b8021db4e34ed7742b9eb69c531dad5aaf0278 (patch)
treeb724dbd9344ba32be43f7dadb85ff2e8b289c3b7
parentd61b6875876f33c2e5ceecc8267dedeba4fa0102 (diff)
downloadhdf5-05b8021db4e34ed7742b9eb69c531dad5aaf0278.zip
hdf5-05b8021db4e34ed7742b9eb69c531dad5aaf0278.tar.gz
hdf5-05b8021db4e34ed7742b9eb69c531dad5aaf0278.tar.bz2
[svn-r11895] Purpose:
Bug fix. Description: Seems like some compilers don't like the "inline" function spec. Solution: Removed the inline description for the sub_time function. Platforms tested: heping and tg-login. Misc. update:
-rw-r--r--perform/pio_timer.c25
1 files changed, 16 insertions, 9 deletions
diff --git a/perform/pio_timer.c b/perform/pio_timer.c
index 027b536..a528e5d 100644
--- a/perform/pio_timer.c
+++ b/perform/pio_timer.c
@@ -38,6 +38,22 @@
/* global variables */
pio_time *timer_g; /* timer: global for stub functions */
+/*
+ * Function: sub_time
+ * Purpose: Struct two time values, and return the difference, in microseconds
+ *
+ * Note that the function assumes that a > b
+ * Programmer: Leon Arber, 1/27/06
+ */
+static double sub_time(struct timeval* a, struct timeval* b)
+{
+ return (((double)a->tv_sec +
+ ((double)a->tv_usec) / MICROSECOND) -
+ ((double)b->tv_sec +
+ ((double)b->tv_usec) / MICROSECOND));
+}
+
+
/*
* Function: pio_time_new
* Purpose: Build us a brand, spankin', new performance time object.
@@ -235,15 +251,6 @@ get_time(pio_time *pt, timer_type t)
return pt->total_time[t];
}
-/* Assumes that a > b */
-static inline double sub_time(struct timeval* a, struct timeval* b)
-{
- ((double)a->tv_sec +
- ((double)a->tv_usec) / MICROSECOND) -
- ((double)b->tv_sec +
- ((double)b->tv_usec) / MICROSECOND);
-}
-
#endif /* H5_HAVE_PARALLEL */
#ifdef STANDALONE
#include "pio_standalone.c"