diff options
| author | kmu <kmu@hdfgroup.org> | 2020-01-23 03:30:36 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2020-01-23 03:30:36 (GMT) |
| commit | 2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8 (patch) | |
| tree | 795739e979593ab3b0d0d3b4a6124c1f7049ab50 /fortran/test/vol_connector.F90 | |
| parent | 408b9b1f3b8e84ba090c51e665d38eedef32c7ee (diff) | |
| parent | d7414053638316081f11fad78474b2c3cde336c5 (diff) | |
| download | hdf5-2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8.zip hdf5-2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8.tar.gz hdf5-2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8.tar.bz2 | |
merge and fix conflict
Diffstat (limited to 'fortran/test/vol_connector.F90')
| -rw-r--r-- | fortran/test/vol_connector.F90 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fortran/test/vol_connector.F90 b/fortran/test/vol_connector.F90 index aabb2b8..cd05cb1 100644 --- a/fortran/test/vol_connector.F90 +++ b/fortran/test/vol_connector.F90 @@ -74,8 +74,8 @@ CONTAINS CALL check("H5VLis_connector_registered_f",error,total_error) CALL VERIFY("H5VLis_connector_registered_f", is_registered, .TRUE., total_error) - CALL H5VLget_connector_id_f(NATIVE_VOL_CONNECTOR_NAME, vol_id_out, error) - CALL check("H5VLget_connector_id_f",error,total_error) + CALL H5VLget_connector_id_by_name_f(NATIVE_VOL_CONNECTOR_NAME, vol_id_out, error) + CALL check("H5VLget_connector_id_by_name_f",error,total_error) CALL H5Fcreate_f("voltest.h5",H5F_ACC_TRUNC_F, file_id, error) CALL check("H5F_create_f",error,total_error) @@ -201,9 +201,9 @@ CONTAINS CALL VERIFY("H5Pget_vol_id_f", vol_id_out, vol_id, total_error) ENDIF - CALL H5VLget_connector_id_f(NATIVE_VOL_CONNECTOR_NAME, vol_id_out, error) - CALL check("H5VLget_connector_id_f",error,total_error) - CALL VERIFY("H5VLget_connector_id_f", vol_id_out, vol_id, total_error) + CALL H5VLget_connector_id_by_name_f(NATIVE_VOL_CONNECTOR_NAME, vol_id_out, error) + CALL check("H5VLget_connector_id_by_name_f",error,total_error) + CALL VERIFY("H5VLget_connector_id_by_name_f", vol_id_out, vol_id, total_error) CALL H5Fcreate_f("voltest.h5",H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl_id) CALL check("H5F_create_f",error,total_error) |