diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2016-12-09 15:18:33 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2016-12-09 15:18:33 (GMT) |
commit | d5f8bca8b6b7635c6604032239026e5de21f3951 (patch) | |
tree | e4611178c3eaea0787296c0a4bc827f716432926 | |
parent | 286e0d744d970777284b616e8ec9e7c96344ac66 (diff) | |
parent | 39e9d347d26a59da29ab6d5f182b45b1b97902fb (diff) | |
download | hdf5-d5f8bca8b6b7635c6604032239026e5de21f3951.zip hdf5-d5f8bca8b6b7635c6604032239026e5de21f3951.tar.gz hdf5-d5f8bca8b6b7635c6604032239026e5de21f3951.tar.bz2 |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_8)
* commit '39e9d347d26a59da29ab6d5f182b45b1b97902fb':
HDFFV-10036: HDF5 Fails to compile fortran tests with NAG and -i8 and -r8 flags
-rw-r--r-- | fortran/test/tf_F08.f90 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fortran/test/tf_F08.f90 b/fortran/test/tf_F08.f90 index 9844702..6d6a817 100644 --- a/fortran/test/tf_F08.f90 +++ b/fortran/test/tf_F08.f90 @@ -45,11 +45,12 @@ MODULE TH5_MISC_PROVISIONAL INTEGER, PARAMETER :: dp = SELECTED_REAL_KIND(10) ! This should map to REAL*8 on most modern processors ! generic compound datatype - TYPE, BIND(C) :: comp_datatype + TYPE :: comp_datatype + SEQUENCE REAL :: a INTEGER :: x DOUBLE PRECISION :: y - CHARACTER(LEN=1) :: z + CHARACTER(KIND=C_CHAR) :: z END TYPE comp_datatype PUBLIC :: H5_SIZEOF |