diff options
author | Elena Pourmal <epourmal@hdfgroup.org> | 2008-05-13 18:37:48 (GMT) |
---|---|---|
committer | Elena Pourmal <epourmal@hdfgroup.org> | 2008-05-13 18:37:48 (GMT) |
commit | 4297f8cc78a7ca0f1e190e62806e9c63a945756c (patch) | |
tree | 67997c0bfb336ba65750ac9949f5a1dda678f50f /fortran/test | |
parent | ee187da419d14739a67d2550369a1ca86128f178 (diff) | |
download | hdf5-4297f8cc78a7ca0f1e190e62806e9c63a945756c.zip hdf5-4297f8cc78a7ca0f1e190e62806e9c63a945756c.tar.gz hdf5-4297f8cc78a7ca0f1e190e62806e9c63a945756c.tar.bz2 |
[svn-r14992] Maintenance: Brought changes from trunk into 1.8 branch
Platforms tested: kagiso, will do more testing later with -i8 flag.
Diffstat (limited to 'fortran/test')
-rw-r--r-- | fortran/test/tH5G_1_8.f90 | 4 | ||||
-rw-r--r-- | fortran/test/tH5R.f90 | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/fortran/test/tH5G_1_8.f90 b/fortran/test/tH5G_1_8.f90 index d4dd9cd..092d90d 100644 --- a/fortran/test/tH5G_1_8.f90 +++ b/fortran/test/tH5G_1_8.f90 @@ -1238,7 +1238,7 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error) ! /* Query default group creation property settings */ CALL H5Pget_local_heap_size_hint_f(gcpl, lheap_size_hint, error) CALL check("H5Pget_local_heap_size_hint_f",error,total_error) - CALL verify("H5Pget_local_heap_size_hint_f", lheap_size_hint,0,total_error) + CALL verify("H5Pget_local_heap_size_hint_f", INT(lheap_size_hint),0,total_error) CALL H5Pget_link_phase_change_f(gcpl, max_compact, min_dense, error) CALL check("H5Pget_link_phase_change_f", error, total_error) @@ -1270,7 +1270,7 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error) CALL H5Pget_local_heap_size_hint_f(gcpl, lheap_size_hint, error) CALL check("H5Pget_local_heap_size_hint_f",error,total_error) - CALL verify("H5Pget_local_heap_size_hint_f", lheap_size_hint,LIFECYCLE_LOCAL_HEAP_SIZE_HINT,total_error) + CALL verify("H5Pget_local_heap_size_hint_f", INT(lheap_size_hint),INT(LIFECYCLE_LOCAL_HEAP_SIZE_HINT),total_error) CALL H5Pget_link_phase_change_f(gcpl, max_compact, min_dense, error) CALL check("H5Pget_link_phase_change_f", error, total_error) diff --git a/fortran/test/tH5R.f90 b/fortran/test/tH5R.f90 index 9dfc374..1fe26c3 100644 --- a/fortran/test/tH5R.f90 +++ b/fortran/test/tH5R.f90 @@ -147,21 +147,21 @@ SUBROUTINE refobjtest(cleanup, total_error) CALL H5Rget_name_f(dsetr_id, ref(1), buf, error, buf_size ) CALL check("H5Rget_name_f", error, total_error) - CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T), total_error) + CALL VERIFY("H5Rget_name_f", INT(buf_size),7, total_error) CALL VerifyString("H5Rget_name_f", buf, "/GROUP1", total_error) ! with buffer bigger then needed CALL H5Rget_name_f(dsetr_id, ref(1), buf_big, error, buf_size ) CALL check("H5Rget_name_f", error, total_error) - CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T),total_error) + CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error) CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/GROUP1", total_error) ! getting path to dataset in /Group1 CALL H5Rget_name_f(dsetr_id, ref(2), buf_big, error, buf_size ) CALL check("H5Rget_name_f", error, total_error) - CALL VERIFY("H5Rget_name_f", buf_size,INT(14,SIZE_T),total_error) + CALL VERIFY("H5Rget_name_f", INT(buf_size),14,total_error) CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/GROUP1/GROUP2", total_error) ! @@ -371,14 +371,14 @@ SUBROUTINE refregtest(cleanup, total_error) ! Get name of the dataset the first region reference points to using H5Rget_name_f CALL H5Rget_name_f(dsetr_id, ref_out(1), buf, error, buf_size ) CALL check("H5Rget_name_f", error, total_error) - CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T),total_error) + CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error) CALL VerifyString("H5Rget_name_f", buf, "/MATRIX", total_error) ! Get name of the dataset the first region reference points to using H5Rget_name_f ! buffer bigger then needed CALL H5Rget_name_f(dsetr_id, ref_out(1), buf_big, error, buf_size ) CALL check("H5Rget_name_f", error, total_error) - CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T),total_error) + CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error) CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/MATRIX", total_error) @@ -386,7 +386,7 @@ SUBROUTINE refregtest(cleanup, total_error) ! buffer smaller then needed CALL H5Rget_name_f(dsetr_id, ref_out(1), buf_small, error, buf_size ) CALL check("H5Rget_name_f", error, total_error) - CALL VERIFY("H5Rget_name_f", buf_size,INT(7,SIZE_T),total_error) + CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error) CALL VerifyString("H5Rget_name_f", TRIM(buf_small), "/MAT", total_error) ! |