Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes compilation failures due to H5E additions #4090

Merged
merged 1 commit into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fortran/src/H5Eff.F90
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ INTEGER(C_INT) FUNCTION H5Ewalk(err_stack, direction, op, op_data) &
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

Expand Down
8 changes: 4 additions & 4 deletions fortran/test/tH5E_F03.F90
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Loading