diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2001-08-06 16:01:44 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2001-08-06 16:01:44 (GMT) |
| commit | 41529d180ebc129f831d9bfea162e377d598fe92 (patch) | |
| tree | 8df90e91eecd382f91c7b6e81aff192db208bc31 /tools/h5dump/h5dump.c | |
| parent | 2a39beb49bed12fa0385fbae4c2f118f5809e842 (diff) | |
| download | hdf5-41529d180ebc129f831d9bfea162e377d598fe92.zip hdf5-41529d180ebc129f831d9bfea162e377d598fe92.tar.gz hdf5-41529d180ebc129f831d9bfea162e377d598fe92.tar.bz2 | |
[svn-r4312] Purpose:
Feature shift
Description:
Take out the v1.2.x compatibility stubs and put in the hooks for v1.4.x
compatibility when needed.
Platforms tested:
FreeBSD 4.3 (hawkwind)
Diffstat (limited to 'tools/h5dump/h5dump.c')
| -rw-r--r-- | tools/h5dump/h5dump.c | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index 4a99794..004a5b8 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -876,29 +876,6 @@ print_datatype(hid_t type) for (i = 0; i < nmembers; i++) { fname = H5Tget_member_name(type, i); mtype = H5Tget_member_type(type, i); -#ifdef WANT_H5_V1_2_COMPAT - /* v1.2 returns the base type of an array field, work around this */ - { - hid_t new_mtype; /* datatype for array, if necessary */ - int arrndims; /* Array rank for reading */ - size_t dims[H5S_MAX_RANK]; /* Array dimensions for reading */ - hsize_t arrdims[H5S_MAX_RANK]; /* Array dimensions for reading */ - int k; /* Local index variable */ - - /* Get the array dimensions */ - arrndims=H5Tget_member_dims(type,i,dims,NULL); - - /* Patch up array information */ - if(arrndims>0) { - for(k=0; k<arrndims; k++) - arrdims[k]=dims[k]; - new_mtype=H5Tarray_create(mtype,arrndims,arrdims,NULL); - H5Tclose(mtype); - mtype=new_mtype; - } /* end if */ - } -#endif /* WANT_H5_V1_2_COMPAT */ - indentation(indent + COL); if (H5Tget_class(mtype) == H5T_COMPOUND) @@ -3662,28 +3639,6 @@ xml_print_datatype(hid_t type) fname = H5Tget_member_name(type, i); mtype = H5Tget_member_type(type, i); -#ifdef WANT_H5_V1_2_COMPAT - /* v1.2 returns the base type of an array field, work around this */ - { - hid_t new_mtype; /* datatype for array, if necessary */ - int arrndims; /* Array rank for reading */ - size_t dims[H5S_MAX_RANK]; /* Array dimensions for reading */ - hsize_t arrdims[H5S_MAX_RANK]; /* Array dimensions for reading */ - int k; /* Local index variable */ - - /* Get the array dimensions */ - arrndims=H5Tget_member_dims(type,i,dims,NULL); - - /* Patch up array information */ - if(arrndims>0) { - for(k=0; k<arrndims; k++) - arrdims[k]=dims[k]; - new_mtype=H5Tarray_create(mtype,arrndims,arrdims,NULL); - H5Tclose(mtype); - mtype=new_mtype; - } /* end if */ - } -#endif /* WANT_H5_V1_2_COMPAT */ indentation(indent); t_fname = xml_escape_the_name(fname); printf("<Field FieldName=\"%s\">\n", t_fname); @@ -4241,28 +4196,6 @@ xml_dump_named_datatype(hid_t type, const char *name) fname = H5Tget_member_name(type, x); mtype = H5Tget_member_type(type, x); -#ifdef WANT_H5_V1_2_COMPAT - /* v1.2 returns the base type of an array field, work around this */ - { - hid_t new_mtype; /* datatype for array, if necessary */ - int arrndims; /* Array rank for reading */ - size_t dims[H5S_MAX_RANK]; /* Array dimensions for reading */ - hsize_t arrdims[H5S_MAX_RANK]; /* Array dimensions for reading */ - int k; /* Local index variable */ - - /* Get the array dimensions */ - arrndims=H5Tget_member_dims(type,x,dims,NULL); - - /* Patch up array information */ - if(arrndims>0) { - for(k=0; k<arrndims; k++) - arrdims[k]=dims[k]; - new_mtype=H5Tarray_create(mtype,arrndims,arrdims,NULL); - H5Tclose(mtype); - mtype=new_mtype; - } /* end if */ - } -#endif /* WANT_H5_V1_2_COMPAT */ indentation(indent); t_fname = xml_escape_the_name(fname); printf("<Field FieldName=\"%s\">\n", t_fname); |