diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-18 22:02:19 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-18 22:02:19 (GMT) |
| commit | a5984f59f71739531fb78c3933a726e73dd54328 (patch) | |
| tree | 839fdd36b93e7976c97b9a351e3937266d1dd7b3 /hl | |
| parent | cf56cd041d119914d7a9bee79c22e59a8ce85059 (diff) | |
| download | hdf5-a5984f59f71739531fb78c3933a726e73dd54328.zip hdf5-a5984f59f71739531fb78c3933a726e73dd54328.tar.gz hdf5-a5984f59f71739531fb78c3933a726e73dd54328.tar.bz2 | |
[svn-r14212] Description:
Make H5Tarray_create() and H5Tget_array_dims() versioned, and drop the
"perm" parameter from the '2' versions.
Shift internal library usage to '2' versions.
Add simple regression tests for '1' versions.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/src/H5LT.c | 2 | ||||
| -rw-r--r-- | hl/src/H5LTparse.c | 2 | ||||
| -rw-r--r-- | hl/src/H5LTparse.y | 2 | ||||
| -rw-r--r-- | hl/test/test_lite.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index e226f89..ca56d69 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -2173,7 +2173,7 @@ next: /* Get array information */ if((ndims = H5Tget_array_ndims(dtype)) < 0) goto out; - if(H5Tget_array_dims(dtype, dims, NULL) < 0) + if(H5Tget_array_dims2(dtype, dims) < 0) goto out; /* Print array dimensions */ diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c index b146046..35c4670 100644 --- a/hl/src/H5LTparse.c +++ b/hl/src/H5LTparse.c @@ -888,7 +888,7 @@ break; case 57: #line 213 "H5LTparse.y" { - yyval.ival = H5Tarray_create(yyvsp[-1].ival, arr_stack[asindex].ndims, arr_stack[asindex].dims, NULL); + yyval.ival = H5Tarray_create2(yyvsp[-1].ival, arr_stack[asindex].ndims, arr_stack[asindex].dims); arr_stack[asindex].ndims = 0; asindex--; H5Tclose(yyvsp[-1].ival); diff --git a/hl/src/H5LTparse.y b/hl/src/H5LTparse.y index a508c95..7866add 100644 --- a/hl/src/H5LTparse.y +++ b/hl/src/H5LTparse.y @@ -211,7 +211,7 @@ offset : NUMBER array_type : H5T_ARRAY_TOKEN { asindex++; /*pushd onto the stack*/ } '{' dim_list ddl_type '}' { - $<ival>$ = H5Tarray_create($<ival>5, arr_stack[asindex].ndims, arr_stack[asindex].dims, NULL); + $<ival>$ = H5Tarray_create2($<ival>5, arr_stack[asindex].ndims, arr_stack[asindex].dims); arr_stack[asindex].ndims = 0; asindex--; H5Tclose($<ival>5); diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c index d8aeb99..239ad60 100644 --- a/hl/test/test_lite.c +++ b/hl/test/test_lite.c @@ -1420,7 +1420,7 @@ static int test_arrays(void) if(ndims != 3) goto out; - if(H5Tget_array_dims(dtype, dims, NULL) < 0) + if(H5Tget_array_dims2(dtype, dims) < 0) goto out; if(dims[0] != 5 || dims[1] != 7 || dims[2] != 13) goto out; |