summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2024-03-08 18:57:05 (GMT)
committerGitHub <noreply@github.com>2024-03-08 18:57:05 (GMT)
commitf22f538ab7fd41a1ea27a78995afb8ebb7035d4e (patch)
treef42ee09ae95582ae69fb52f38446af535f8225d1
parent7de7c25646ffe00c9c91ad4bebbc55c91b4c197f (diff)
downloadhdf5-f22f538ab7fd41a1ea27a78995afb8ebb7035d4e.zip
hdf5-f22f538ab7fd41a1ea27a78995afb8ebb7035d4e.tar.gz
hdf5-f22f538ab7fd41a1ea27a78995afb8ebb7035d4e.tar.bz2
fixes compilation failures due to H5E additions (#4090)
-rw-r--r--fortran/src/H5Eff.F902
-rw-r--r--fortran/test/tH5E_F03.F908
2 files changed, 5 insertions, 5 deletions
diff --git a/fortran/src/H5Eff.F90 b/fortran/src/H5Eff.F90
index a95028f..9ea2807 100644
--- a/fortran/src/H5Eff.F90
+++ b/fortran/src/H5Eff.F90
@@ -712,7 +712,7 @@ CONTAINS
END FUNCTION H5Ewalk
END INTERFACE
- hdferr = INT(H5Ewalk(err_stack, direction, op, op_data))
+ hdferr = INT(H5Ewalk(err_stack, INT(direction, C_INT), op, op_data))
END SUBROUTINE h5ewalk_f
diff --git a/fortran/test/tH5E_F03.F90 b/fortran/test/tH5E_F03.F90
index f5ed9fb..86e77ec 100644
--- a/fortran/test/tH5E_F03.F90
+++ b/fortran/test/tH5E_F03.F90
@@ -201,10 +201,10 @@ SUBROUTINE test_error(total_error)
! ** SET THE CUSTOMIZED PRINTING OF ERROR STACK **
! set the customized error handling routine
- func = c_funloc(my_hdf5_error_handler)
+ func = C_FUNLOC(my_hdf5_error_handler)
! set the data sent to the customized routine
- f_ptr = c_loc(my_hdf5_error_handler_data)
+ f_ptr = C_LOC(my_hdf5_error_handler_data)
CALL H5Eset_auto_f(1, error, H5E_DEFAULT_F, func, f_ptr)
CALL check("H5Eset_auto_f", error, total_error)
@@ -280,8 +280,8 @@ SUBROUTINE test_error_stack(total_error)
func = "FUNC"//C_NULL_CHAR
line = 99
- ptr1 = C_LOC(file)
- ptr2 = C_LOC(func)
+ ptr1 = C_LOC(file(1:1))
+ ptr2 = C_LOC(func(1:1))
ptr3 = C_LOC(line)
CALL h5ecreate_stack_f(estack_id, error)