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/h5toh4 | |
| 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/h5toh4')
| -rw-r--r-- | tools/h5toh4/h5toh4.c | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/tools/h5toh4/h5toh4.c b/tools/h5toh4/h5toh4.c index 09138b0..853bfd8 100644 --- a/tools/h5toh4/h5toh4.c +++ b/tools/h5toh4/h5toh4.c @@ -788,28 +788,6 @@ int32 order_array[512]; DEBUG_PRINT("Error detected in %s() [%s line %d]\n", "convert_dataset", __FILE__, __LINE__); break; } -#ifdef H5_WANT_H5_V1_2_COMPAT - /* v1.2 returns the base type of an array field, work around this */ - { - hid_t new_fieldtype; /* 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,idx,dims,NULL); - - /* Patch up array information */ - if(arrndims>0) { - for(k=0; k<arrndims; k++) - arrdims[k]=dims[k]; - new_fieldtype=H5Tarray_create(fieldtype,arrndims,arrdims,NULL); - H5Tclose(fieldtype); - fieldtype=new_fieldtype; - } /* end if */ - } -#endif /* WANT_H5_V1_2_COMPAT */ /* Special case for array fields */ if(H5Tget_class(fieldtype)==H5T_ARRAY) { hid_t arr_base_type; @@ -932,28 +910,6 @@ int32 order_array[512]; DEBUG_PRINT("Error detected in %s() [%s line %d]\n", "convert_dataset", __FILE__, __LINE__); break; } -#ifdef H5_WANT_H5_V1_2_COMPAT - /* v1.2 returns the base type of an array field, work around this */ - { - hid_t new_arr_type; /* 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,idx,dims,NULL); - - /* Patch up array information */ - if(arrndims>0) { - for(k=0; k<arrndims; k++) - arrdims[k]=dims[k]; - new_arr_type=H5Tarray_create(arr_type,arrndims,arrdims,NULL); - H5Tclose(arr_type); - arr_type=new_arr_type; - } /* end if */ - } -#endif /* WANT_H5_V1_2_COMPAT */ /* Get the number of dimensions */ if ((ndimf = H5Tget_array_ndims(arr_type)) < 0 || ndimf > H5S_MAX_RANK ) { fprintf(stderr, "Error: rank of members of compound type should not be %d\n",ndimf); |