[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)

2 files changed, 0 insertions, 44 deletions

diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 42cc70c..a34c5b3 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -1091,28 +1091,6 @@ h5tools_fixtype(hid_t f_type)
 	for (i = 0, size = 0; i < nmembs; i++) {
 	    /* Get the member type and fix it */
 	    f_memb = H5Tget_member_type(f_type, i);
-#ifdef WANT_H5_V1_2_COMPAT
-            /* v1.2 returns the base type of an array field, work around this */
-            {
-                hid_t new_f_memb;   /* 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 j;              /* Local index variable */
-
-                /* Get the array dimensions */
-                arrndims=H5Tget_member_dims(f_type,i,dims,NULL);
-
-                /* Patch up array information */
-                if(arrndims>0) {
-                    for(j=0; j<arrndims; j++)
-                        arrdims[j]=dims[j];
-                    new_f_memb=H5Tarray_create(f_memb,arrndims,arrdims,NULL);
-                    H5Tclose(f_memb);
-                    f_memb=new_f_memb;
-                } /* end if */
-            }
-#endif /* WANT_H5_V1_2_COMPAT */
 	    memb[i] = h5tools_fixtype(f_memb);
 	    H5Tclose(f_memb);
 
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 0836537..e594ebd 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -682,28 +682,6 @@ h5tools_str_sprint(h5tools_str_t *str, const h5dump_t *info, hid_t container,
             /* The value */
             offset = H5Tget_member_offset(type, j);
             memb = H5Tget_member_type(type, j);
-#ifdef WANT_H5_V1_2_COMPAT
-            /* v1.2 returns the base type of an array field, work around this */
-            {
-                hid_t new_memb;         /* 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,j,dims,NULL);
-
-                /* Patch up array information */
-                if(arrndims>0) {
-                    for(k=0; k<arrndims; k++)
-                        arrdims[k]=dims[k];
-                    new_memb=H5Tarray_create(memb,arrndims,arrdims,NULL);
-                    H5Tclose(memb);
-                    memb=new_memb;
-                } /* end if */
-            }
-#endif /* WANT_H5_V1_2_COMPAT */
 
             ctx->indent_level++;
             h5tools_str_sprint(str, info, container, memb, cp_vp + offset , ctx);