diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Oprivate.h | 5 | ||||
| -rw-r--r-- | src/H5P.c | 2 | ||||
| -rw-r--r-- | src/H5private.h | 17 | ||||
| -rw-r--r-- | src/H5timer.c | 2 |
4 files changed, 11 insertions, 15 deletions
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 834bf1f..956c00d 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -791,11 +791,6 @@ typedef struct H5O_fsinfo_t { typedef herr_t (*H5O_operator_t)(const void *mesg/*in*/, unsigned idx, void *operator_data/*in,out*/); -#ifdef OUT -/* Typedef for "internal library" iteration operations */ -typedef herr_t (*H5O_lib_operator_t)(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, - unsigned sequence, hbool_t *oh_modified/*out*/, void *operator_data/*in,out*/); -#endif /* Typedef for "internal library" iteration operations */ typedef herr_t (*H5O_lib_operator_t)(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence, unsigned *oh_modified/*out*/, void *operator_data/*in,out*/); @@ -639,7 +639,7 @@ done: PURPOSE Routine to set a property's value in a property list. USAGE - herr_t H5P_set(plist_id, name, value) + herr_t H5Pset(plist_id, name, value) hid_t plist_id; IN: Property list to find property in const char *name; IN: Name of property to set void *value; IN: Pointer to the value for the property diff --git a/src/H5private.h b/src/H5private.h index fa5a114..e0ed6ef 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -538,20 +538,21 @@ * It's the developer's responsibility not to pass in the value 0, which * may cause the equation to fail. */ -#define H5_FLT_ABS_EQUAL(X,Y) (HDfabsf(X-Y) < FLT_EPSILON) -#define H5_DBL_ABS_EQUAL(X,Y) (HDfabs (X-Y) < DBL_EPSILON) -#define H5_LDBL_ABS_EQUAL(X,Y) (HDfabsl(X-Y) < LDBL_EPSILON) +#define H5_FLT_ABS_EQUAL(X,Y) (HDfabsf((X)-(Y)) < FLT_EPSILON) +#define H5_DBL_ABS_EQUAL(X,Y) (HDfabs ((X)-(Y)) < DBL_EPSILON) +#define H5_LDBL_ABS_EQUAL(X,Y) (HDfabsl((X)-(Y)) < LDBL_EPSILON) -#define H5_FLT_REL_EQUAL(X,Y,M) (HDfabsf((Y-X) / X) < M) -#define H5_DBL_REL_EQUAL(X,Y,M) (HDfabs ((Y-X) / X) < M) -#define H5_LDBL_REL_EQUAL(X,Y,M) (HDfabsl((Y-X) / X) < M) +#define H5_FLT_REL_EQUAL(X,Y,M) (HDfabsf(((Y)-(X)) / (X)) < (M)) +#define H5_DBL_REL_EQUAL(X,Y,M) (HDfabs (((Y)-(X)) / (X)) < (M)) +#define H5_LDBL_REL_EQUAL(X,Y,M) (HDfabsl(((Y)-(X)) / (X)) < (M)) -/* KiB, MiB, GiB, TiB, EiB - Used in profiling and timing code */ +/* KiB, MiB, GiB, TiB, PiB, EiB - Used in profiling and timing code */ #define H5_KB (1024.0F) #define H5_MB (1024.0F * 1024.0F) #define H5_GB (1024.0F * 1024.0F * 1024.0F) #define H5_TB (1024.0F * 1024.0F * 1024.0F * 1024.0F) -#define H5_EB (1024.0F * 1024.0F * 1024.0F * 1024.0F * 1024.0F) +#define H5_PB (1024.0F * 1024.0F * 1024.0F * 1024.0F * 1024.0F) +#define H5_EB (1024.0F * 1024.0F * 1024.0F * 1024.0F * 1024.0F * 1024.0F) #ifndef H5_HAVE_FLOCK /* flock() operations. Used in the source so we have to define them when diff --git a/src/H5timer.c b/src/H5timer.c index 94f2883..d9be6bb 100644 --- a/src/H5timer.c +++ b/src/H5timer.c @@ -228,7 +228,7 @@ H5_bandwidth(char *buf/*out*/, double nbytes, double nseconds) } else if(bw < H5_TB) { sprintf(buf, "%05.4f", bw / H5_GB); HDstrcpy(buf+5, " GB/s"); - } else if(bw < H5_EB) { + } else if(bw < H5_PB) { sprintf(buf, "%05.4f", bw / H5_TB); HDstrcpy(buf+5, " TB/s"); } else { |