summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2016-05-16 13:13:20 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2016-05-16 13:13:20 (GMT)
commit61d18bbebef33909d23ca645528d995b1c6739ea (patch)
treedc4c419db1dc82e70c4dd902fa50f2538ee3477d
parent5871eed008a796f35df53f6dc605dcac7cb428e7 (diff)
downloadhdf5-61d18bbebef33909d23ca645528d995b1c6739ea.zip
hdf5-61d18bbebef33909d23ca645528d995b1c6739ea.tar.gz
hdf5-61d18bbebef33909d23ca645528d995b1c6739ea.tar.bz2
[svn-r29939] HDFFV-9917: compile time error with H5f90global.f90
Fix:Made datatypes the same type and kind for both args to MAX(). Tested: jam (gnu)
-rw-r--r--fortran/src/H5f90global.F908
1 files changed, 4 insertions, 4 deletions
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index eb7f99f..af0a000 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -984,17 +984,17 @@ CONTAINS
CHARACTER(LEN=*), INTENT(OUT) :: f_string
INTEGER(SIZE_T) :: c_len, f_len
- ! Find the length of the C string by located the null terminator
- c_len = MAX(INDEX(c_string,C_NULL_CHAR, KIND=SIZE_T)-1,1)
+ ! Find the length of the C string by locating the null terminator
+ c_len = MAX(INDEX(c_string,C_NULL_CHAR, KIND=SIZE_T)-1_SIZE_T,1_SIZE_T)
! Find the length of the Fortran string
f_len = LEN(f_string)
- ! CASE (1): C string is equal to or larger then Fortran character buffer,
+ ! CASE (1): C string is equal to or larger than Fortran character buffer,
! so fill the entire Fortran buffer.
IF(c_len.GE.f_len)THEN !
f_string(1:f_len) = c_string(1:f_len)
- ! CASE (2): C string is smaller then Fortran character buffer,
+ ! CASE (2): C string is smaller than Fortran character buffer,
! so copy C string and blank pad remaining characters.
ELSE
f_string(1:c_len) = c_string(1:c_len)