diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2014-07-30 20:55:14 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-07-30 20:55:14 (GMT) |
commit | 33ea1ada248725e4cce6316c503e5c760bcca49c (patch) | |
tree | 3fd7e951132e6aa9b7d241a418505d3ae6e33587 /tools/misc/h5perf_gentest.c | |
parent | 3f701fda6528be0844afa2315c2a28357591349a (diff) | |
download | hdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.zip hdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.tar.gz hdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.tar.bz2 |
[svn-r25496] Description:
Merge 64-bit ID changes from branch to trunk. (Plus a few minor cleanups
that aren't on the branch)
Tested on:
Mac OSX/64 10.9.4 (amazon) w/C++ & FORTRAN
(h5committested on branch already for a week)
Diffstat (limited to 'tools/misc/h5perf_gentest.c')
-rw-r--r-- | tools/misc/h5perf_gentest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/misc/h5perf_gentest.c b/tools/misc/h5perf_gentest.c index 6729ed4..50c18c1 100644 --- a/tools/misc/h5perf_gentest.c +++ b/tools/misc/h5perf_gentest.c @@ -395,8 +395,8 @@ herr_t create_perf_test_file(const char *fname, int ngrps, int ndsets, H5Dclose(did); /* 11 add object refs */ - H5Rcreate(&buf_ref[0],gid1, ".", H5R_OBJECT, -1); - H5Rcreate(&buf_ref[1],gid1, tmp_name3, H5R_OBJECT, -1); + H5Rcreate(&buf_ref[0],gid1, ".", H5R_OBJECT, (hid_t)-1); + H5Rcreate(&buf_ref[1],gid1, tmp_name3, H5R_OBJECT, (hid_t)-1); sprintf(name, "%05d obj refs", j); did = H5Dcreate (gid1, name, H5T_STD_REF_OBJ, sid_2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); H5Dwrite (did, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_ref); @@ -533,7 +533,7 @@ int add_attrs(hid_t oid, int idx) /* 4 single point */ sid = H5Screate_simple (1, dims1, NULL); - H5Rcreate(&ref, oid, ".", H5R_OBJECT, -1); + H5Rcreate(&ref, oid, ".", H5R_OBJECT, (hid_t)-1); sprintf(name, "%05d single float", idx); nattrs += add_attr(oid, name, H5T_NATIVE_FLOAT, sid, &f); sprintf(name, "%05d single double", idx); |