diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 02:55:33 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 02:55:33 (GMT) |
| commit | 238950487f6348544b64fda3143479c6ab589fde (patch) | |
| tree | e2985b88137935511547333d9a9c2c25d74c57e5 /tools | |
| parent | 7c22743e8eaa5e5d2ffc8b0db7518ed6c5be40ee (diff) | |
| download | hdf5-238950487f6348544b64fda3143479c6ab589fde.zip hdf5-238950487f6348544b64fda3143479c6ab589fde.tar.gz hdf5-238950487f6348544b64fda3143479c6ab589fde.tar.bz2 | |
[svn-r17270] Description:
Bring r17265:17269 from trunk to revise_chunks branch
Tested on
FreeBSD/32 6.3 (duty)
(h5committest not required on this branch)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5dump/h5dumpgentest.c | 12 | ||||
| -rw-r--r-- | tools/h5jam/h5jamgentest.c | 4 | ||||
| -rw-r--r-- | tools/h5repack/h5repack_filters.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c index c7e1445..75d9b60 100644 --- a/tools/h5dump/h5dumpgentest.c +++ b/tools/h5dump/h5dumpgentest.c @@ -144,7 +144,7 @@ return -1; const H5L_class_t UD_link_class[1] = {{ H5L_LINK_CLASS_T_VERS, /* H5L_class_t version */ - MY_LINKCLASS, /* Link type id number */ + (H5L_type_t)MY_LINKCLASS, /* Link type id number */ "UD link class", /* name for debugging */ NULL, /* Creation callback */ NULL, /* Move/rename callback */ @@ -517,9 +517,9 @@ static void gent_udlink(void) /* This ud link will dangle, but that's okay */ fid = H5Fcreate(FILE54, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); - H5Lcreate_ud(fid, "udlink1", MY_LINKCLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT); + H5Lcreate_ud(fid, "udlink1", (H5L_type_t)MY_LINKCLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT); strcpy(buf, "foo"); - H5Lcreate_ud(fid, "udlink2", MY_LINKCLASS, buf, 4, H5P_DEFAULT, H5P_DEFAULT); + H5Lcreate_ud(fid, "udlink2", (H5L_type_t)MY_LINKCLASS, buf, 4, H5P_DEFAULT, H5P_DEFAULT); H5Fclose(fid); } @@ -1032,7 +1032,7 @@ static void gent_all(void) /* user-defined link */ H5Lregister(UD_link_class); - H5Lcreate_ud(fid, "/g2/udlink", MY_LINKCLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT); + H5Lcreate_ud(fid, "/g2/udlink", (H5L_type_t)MY_LINKCLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT); H5Fclose(fid); } @@ -1282,7 +1282,7 @@ static void gent_many(void) /* Create dangling external and UD links */ H5Lcreate_external("somefile", "somepath", fid, "/g8/elink", H5P_DEFAULT, H5P_DEFAULT); H5Lregister(UD_link_class); - H5Lcreate_ud(fid, "/g8/udlink", MY_LINKCLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT); + H5Lcreate_ud(fid, "/g8/udlink", (H5L_type_t)MY_LINKCLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT); /* Create links to external and UD links */ ret= H5Lcreate_soft("/g8/elink", fid, "/g7/slink5", H5P_DEFAULT, H5P_DEFAULT); @@ -5096,7 +5096,7 @@ static void gent_fcontents(void) assert(ret >= 0); /* dangling udlink */ - ret = H5Lcreate_ud(fid, "udlink", MY_LINKCLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT); + ret = H5Lcreate_ud(fid, "udlink", (H5L_type_t)MY_LINKCLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT); assert(ret >= 0); /*------------------------------------------------------------------------- diff --git a/tools/h5jam/h5jamgentest.c b/tools/h5jam/h5jamgentest.c index 7b7e648..5a3d828 100644 --- a/tools/h5jam/h5jamgentest.c +++ b/tools/h5jam/h5jamgentest.c @@ -132,7 +132,7 @@ static hid_t UD_traverse(const char UNUSED * link_name, hid_t UNUSED cur_group, #define MY_LINKCLASS 187 const H5L_class_t UD_link_class[1] = {{ H5L_LINK_CLASS_T_VERS, /* H5L_class_t version */ - MY_LINKCLASS, /* Link type id number */ + (H5L_type_t)MY_LINKCLASS, /* Link type id number */ "UD link class", /* name for debugging */ NULL, /* Creation callback */ NULL, /* Move/rename callback */ @@ -301,7 +301,7 @@ gent_ub(const char * filename, size_t ub_size, size_t ub_fill) /* user-defined link */ H5Lregister(UD_link_class); - H5Lcreate_ud(fid, "/g2/udlink", MY_LINKCLASS, NULL, (size_t)0, H5P_DEFAULT, H5P_DEFAULT); + H5Lcreate_ud(fid, "/g2/udlink", (H5L_type_t)MY_LINKCLASS, NULL, (size_t)0, H5P_DEFAULT, H5P_DEFAULT); H5Fclose(fid); diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c index 6b08a2f..92b263b 100644 --- a/tools/h5repack/h5repack_filters.c +++ b/tools/h5repack/h5repack_filters.c @@ -419,7 +419,7 @@ int apply_filters(const char* name, /* object name from traverse list */ H5Z_SO_scale_type_t scale_type; int scale_factor; - scale_type = obj.filter[i].cd_values[0]; + scale_type = (H5Z_SO_scale_type_t)obj.filter[i].cd_values[0]; scale_factor = obj.filter[i].cd_values[1]; if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0) |