summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-08-12 17:13:12 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-08-12 17:13:12 (GMT)
commit48c429d4a39c2257b33567f15639a2d239876e65 (patch)
treefe5a747c88bf3757fc9f289f7bf1ea632c3d1b67
parentc98d072e6987afd9a3b7c501b36cc99f5fc7ec98 (diff)
downloadhdf5-48c429d4a39c2257b33567f15639a2d239876e65.zip
hdf5-48c429d4a39c2257b33567f15639a2d239876e65.tar.gz
hdf5-48c429d4a39c2257b33567f15639a2d239876e65.tar.bz2
[svn-r27497] Fixed missing variable declarations.
tested: h5committest.
-rw-r--r--fortran/src/H5_ff.F9034
1 files changed, 20 insertions, 14 deletions
diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90
index 39e23a7..a95c284 100644
--- a/fortran/src/H5_ff.F90
+++ b/fortran/src/H5_ff.F90
@@ -371,40 +371,46 @@ CONTAINS
! August 25, 2008
!
! Fortran90 Interface:
- INTEGER(HID_T) FUNCTION h5kind_to_type(kind, flag) RESULT(h5_type)
+ INTEGER(HID_T) FUNCTION h5kind_to_type(ikind, flag) RESULT(h5_type)
+ USE ISO_C_BINDING
IMPLICIT NONE
- INTEGER, INTENT(IN) :: kind
+ INTEGER, INTENT(IN) :: ikind
INTEGER, INTENT(IN) :: flag
+#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
+ Fortran_INTEGER_16=SELECTED_INT_KIND(15)
+#endif
+
+
!*****
IF(flag.EQ.H5_INTEGER_KIND)THEN
- IF(kind.EQ.Fortran_INTEGER_1)THEN
+ IF(ikind.EQ.Fortran_INTEGER_1)THEN
h5_type = H5T_NATIVE_INTEGER_1
- ELSE IF(kind.EQ.Fortran_INTEGER_2)THEN
+ ELSE IF(ikind.EQ.Fortran_INTEGER_2)THEN
h5_type = H5T_NATIVE_INTEGER_2
- ELSE IF(kind.EQ.Fortran_INTEGER_4)THEN
+ ELSE IF(ikind.EQ.Fortran_INTEGER_4)THEN
h5_type = H5T_NATIVE_INTEGER_4
- ELSE IF(kind.EQ.Fortran_INTEGER_8)THEN
+ ELSE IF(ikind.EQ.Fortran_INTEGER_8)THEN
h5_type = H5T_NATIVE_INTEGER_8
#if H5_HAVE_Fortran_INTEGER_SIZEOF_16!=0
- ELSE IF(kind.EQ.Fortran_INTEGER_16)THEN
+ ELSE IF(ikind.EQ.Fortran_INTEGER_16)THEN
h5_type = H5T_NATIVE_INTEGER_16
#endif
ENDIF
ELSE IF(flag.EQ.H5_REAL_KIND)THEN
- IF(kind.EQ.Fortran_REAL_C_FLOAT)THEN
+ IF(ikind.EQ.KIND(1.0_C_FLOAT))THEN
h5_type = H5T_NATIVE_REAL_C_FLOAT
- ELSE IF(kind.EQ.Fortran_REAL_C_DOUBLE)THEN
+ ELSE IF(ikind.EQ.KIND(1.0_C_DOUBLE))THEN
h5_type = H5T_NATIVE_REAL_C_DOUBLE
-#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
- ELSE IF(kind.EQ.Fortran_REAL_C_LONG_DOUBLE)THEN
- h5_type = H5T_NATIVE_REAL_C_LONG_DOUBLE
-#endif
#if H5_PAC_FC_MAX_REAL_PRECISION > 28
#if H5_HAVE_FLOAT128 == 1
- ELSE IF(kind.EQ.Fortran_REAL_C_FLOAT128)THEN
+ ELSE IF(ikind.EQ.KIND(1.0_C_LONG_DOUBLE))THEN
h5_type = H5T_NATIVE_FLOAT_128
#endif
#endif
+#if H5_FORTRAN_C_LONG_DOUBLE_IS_UNIQUE!=0
+ ELSE IF(ikind.EQ.KIND(1.0_C_LONG_DOUBLE))THEN
+ h5_type = H5T_NATIVE_REAL_C_LONG_DOUBLE
+#endif
ELSE
h5_type = -1
ENDIF