diff options
Diffstat (limited to 'src/H5trace.c')
-rw-r--r-- | src/H5trace.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/H5trace.c b/src/H5trace.c index 26a59c7..0d48708 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -155,7 +155,13 @@ H5_trace(const double *returning, const char *func, const char *type, ...) } /* end if */ /* Get time for event */ +<<<<<<< HEAD if(H5_DBL_ABS_EQUAL(first_time.etime, H5_DOUBLE(0.0))) +||||||| parent of 04b8cc82a8... Add routines to query the library's free list sizes and allocation stats. + if(H5_DBL_ABS_EQUAL(first_time.etime, 0.0)) +======= + if(H5_DBL_ABS_EQUAL(first_time.etime, (double)0.0f)) +>>>>>>> 04b8cc82a8... Add routines to query the library's free list sizes and allocation stats. H5_timer_begin(&first_time); if(H5_debug_g.ttimes) H5_timer_begin(&event_time); |