diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-04-21 18:33:25 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-04-21 18:33:25 (GMT) |
| commit | 5e6d18e5be17b43ba446acbbc11d0fbe583abc47 (patch) | |
| tree | 5f9c9b5a16f95bcfa55bcef8bb597847d255b92e /fortran/src | |
| parent | 11b19627b9ac9a97af2970dac92e378baeb9fc1e (diff) | |
| download | hdf5-5e6d18e5be17b43ba446acbbc11d0fbe583abc47.zip hdf5-5e6d18e5be17b43ba446acbbc11d0fbe583abc47.tar.gz hdf5-5e6d18e5be17b43ba446acbbc11d0fbe583abc47.tar.bz2 | |
[svn-r26869] removed the --enable-fortran2003 option, it is now just --enable-fortran
Diffstat (limited to 'fortran/src')
| -rw-r--r-- | fortran/src/H5Aff.F90 | 18 | ||||
| -rw-r--r-- | fortran/src/Makefile.in | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/fortran/src/H5Aff.F90 b/fortran/src/H5Aff.F90 index 0c209fa..a827738 100644 --- a/fortran/src/H5Aff.F90 +++ b/fortran/src/H5Aff.F90 @@ -494,7 +494,7 @@ CONTAINS hdferr = h5aget_name_c(attr_id, size, buf) END SUBROUTINE h5aget_name_f - +!!$ !!$ SUBROUTINE H5Aget_name_f(attr_id, size, buf, hdferr) !!$ IMPLICIT NONE !!$ INTEGER(HID_T), INTENT(IN) :: attr_id @@ -503,9 +503,10 @@ CONTAINS !!$ INTEGER, INTENT(OUT) :: hdferr !!$!***** !!$ CHARACTER(KIND=C_CHAR, LEN=LEN(buf)+1) :: c_buf +!!$ INTEGER(SIZE_T) :: size_out !!$ !!$ INTERFACE -!!$ INTEGER FUNCTION H5Aget_name(attr_id, size, buf) BIND(C, NAME='H5Aget_name') +!!$ INTEGER(SIZE_T) FUNCTION H5Aget_name(attr_id, size, buf) BIND(C, NAME='H5Aget_name') !!$ IMPORT :: C_CHAR !!$ IMPORT :: HID_T, SIZE_T !!$ INTEGER(HID_T), INTENT(IN), VALUE :: attr_id @@ -515,11 +516,14 @@ CONTAINS !!$ END INTERFACE !!$ !!$ ! add 1 for the null char -!!$ PRINT*,H5Aget_name(attr_id, size + 1_SIZE_T, c_buf) -!!$ hdferr = INT(H5Aget_name(attr_id, size + 1_SIZE_T, c_buf)) -!!$ -!!$ CALL H5_Fortran_string_c2f(c_buf, buf) -!!$ +!!$ size_out = H5Aget_name(attr_id, size + 1_SIZE_T, c_buf) +!!$ +!!$ hdferr = 0 +!!$ IF(size_out.LT.0)THEN +!!$ hdferr = -1 +!!$ ELSE +!!$ CALL H5_Fortran_string_c2f(c_buf, buf) +!!$ ENDIF !!$ !!$ END SUBROUTINE H5Aget_name_f diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index f3997c9..0e7f757 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -502,7 +502,6 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FC2003 = @FC2003@ FCFLAGS = @FCFLAGS@ FCFLAGS_f90 = @FCFLAGS_f90@ FCLIBS = @FCLIBS@ @@ -519,13 +518,11 @@ H5_LDFLAGS = @H5_LDFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ -HAVE_FORTRAN_2003 = @HAVE_FORTRAN_2003@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ -HDF_FORTRAN2003 = @HDF_FORTRAN2003@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ |