From 5ae309f0a64860dbdf02d42cbd6d6ee0db5e6bc3 Mon Sep 17 00:00:00 2001 From: Elena Pourmal Date: Sat, 17 May 2008 21:58:27 -0500 Subject: [svn-r15028] Maintenance: Fixed a typo in the fortran h5tget(set)_fields_f subroutines. Platfomrs tested: kagiso with PGI compilers (this is bug 1046, I am not closing it since there is no test for those routines yet) --- fortran/src/H5Tff.f90 | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/fortran/src/H5Tff.f90 b/fortran/src/H5Tff.f90 index 2488522..14748d6 100644 --- a/fortran/src/H5Tff.f90 +++ b/fortran/src/H5Tff.f90 @@ -1129,6 +1129,7 @@ ! Inputs: ! type_id - datatype identifier ! Outputs: +! spos - sign bit-position ! epos - exponent bit-position ! esize - size of exponent in bits ! mpos - mantissa position @@ -1149,7 +1150,7 @@ ! Comment: !---------------------------------------------------------------------- - SUBROUTINE h5tget_fields_f(type_id, epos, esize, mpos, msize, hdferr) + SUBROUTINE h5tget_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr) ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1158,30 +1159,32 @@ ! IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier - INTEGER, INTENT(OUT) :: epos ! exponent bit-position - INTEGER, INTENT(OUT) :: esize ! size of exponent in bits - INTEGER, INTENT(OUT) :: mpos ! mantissa bit-position - INTEGER, INTENT(OUT) :: msize ! size of mantissa in bits + INTEGER(SIZE_T), INTENT(OUT) :: spos ! sign bit-position + INTEGER(SIZE_T), INTENT(OUT) :: epos ! exponent bit-position + INTEGER(SIZE_T), INTENT(OUT) :: esize ! size of exponent in bits + INTEGER(SIZE_T), INTENT(OUT) :: mpos ! mantissa bit-position + INTEGER(SIZE_T), INTENT(OUT) :: msize ! size of mantissa in bits INTEGER, INTENT(OUT) :: hdferr ! Error code ! INTEGER, EXTERNAL :: h5tget_fields_c ! MS FORTRAN needs explicit interface for C functions called here. ! INTERFACE - INTEGER FUNCTION h5tget_fields_c(type_id, epos, esize, mpos, msize) + INTEGER FUNCTION h5tget_fields_c(type_id, spos, epos, esize, mpos, msize) USE H5GLOBAL !DEC$ IF DEFINED(HDF5F90_WINDOWS) !MS$ATTRIBUTES C,reference,alias:'_H5TGET_FIELDS_C'::h5tget_fields_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: type_id - INTEGER, INTENT(OUT) :: epos - INTEGER, INTENT(OUT) :: esize - INTEGER, INTENT(OUT) :: mpos - INTEGER, INTENT(OUT) :: msize + INTEGER(SIZE_T), INTENT(OUT) :: spos + INTEGER(SIZE_T), INTENT(OUT) :: epos + INTEGER(SIZE_T), INTENT(OUT) :: esize + INTEGER(SIZE_T), INTENT(OUT) :: mpos + INTEGER(SIZE_T), INTENT(OUT) :: msize END FUNCTION h5tget_fields_c END INTERFACE - hdferr = h5tget_fields_c(type_id, epos, esize, mpos, msize) + hdferr = h5tget_fields_c(type_id, spos, epos, esize, mpos, msize) END SUBROUTINE h5tget_fields_f !---------------------------------------------------------------------- @@ -1191,6 +1194,7 @@ ! ! Inputs: ! type_id - datatype identifier +! spos - sign bit-position ! epos - exponent bit-position ! esize - size of exponent in bits ! mpos - mantissa position @@ -1213,7 +1217,7 @@ ! Comment: !---------------------------------------------------------------------- - SUBROUTINE h5tset_fields_f(type_id, epos, esize, mpos, msize, hdferr) + SUBROUTINE h5tset_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr) ! !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) @@ -1222,30 +1226,32 @@ ! IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier - INTEGER, INTENT(IN) :: epos ! exponent bit-position - INTEGER, INTENT(IN) :: esize ! size of exponent in bits - INTEGER, INTENT(IN) :: mpos ! mantissa bit-position - INTEGER, INTENT(IN) :: msize ! size of mantissa in bits + INTEGER(SIZE_T), INTENT(IN) :: spos ! sign bit-position + INTEGER(SIZE_T), INTENT(IN) :: epos ! exponent bit-position + INTEGER(SIZE_T), INTENT(IN) :: esize ! size of exponent in bits + INTEGER(SIZE_T), INTENT(IN) :: mpos ! mantissa bit-position + INTEGER(SIZE_T), INTENT(IN) :: msize ! size of mantissa in bits INTEGER, INTENT(OUT) :: hdferr ! Error code ! INTEGER, EXTERNAL :: h5tset_fields_c ! MS FORTRAN needs explicit interface for C functions called here. ! INTERFACE - INTEGER FUNCTION h5tset_fields_c(type_id, epos, esize, mpos, msize) + INTEGER FUNCTION h5tset_fields_c(type_id, spos, epos, esize, mpos, msize) USE H5GLOBAL !DEC$ IF DEFINED(HDF5F90_WINDOWS) !MS$ATTRIBUTES C,reference,alias:'_H5TSET_FIELDS_C'::h5tset_fields_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: type_id - INTEGER, INTENT(IN) :: epos - INTEGER, INTENT(IN) :: esize - INTEGER, INTENT(IN) :: mpos - INTEGER, INTENT(IN) :: msize + INTEGER(SIZE_T), INTENT(IN) :: spos + INTEGER(SIZE_T), INTENT(IN) :: epos + INTEGER(SIZE_T), INTENT(IN) :: esize + INTEGER(SIZE_T), INTENT(IN) :: mpos + INTEGER(SIZE_T), INTENT(IN) :: msize END FUNCTION h5tset_fields_c END INTERFACE - hdferr = h5tset_fields_c(type_id, epos, esize, mpos, msize) + hdferr = h5tset_fields_c(type_id, spos, epos, esize, mpos, msize) END SUBROUTINE h5tset_fields_f !---------------------------------------------------------------------- -- cgit v0.12