diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-06-17 18:09:39 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-06-17 18:09:39 (GMT) |
| commit | bfb60a0cc163035daec7125951fdf993a2c5bf3f (patch) | |
| tree | f68481495a899524c10ea3b66c11ee3e01041b44 /fortran/test/tf_F08.f90 | |
| parent | 0b75068901014374b3aa55367541b3be56ccc815 (diff) | |
| download | hdf5-bfb60a0cc163035daec7125951fdf993a2c5bf3f.zip hdf5-bfb60a0cc163035daec7125951fdf993a2c5bf3f.tar.gz hdf5-bfb60a0cc163035daec7125951fdf993a2c5bf3f.tar.bz2 | |
[svn-r25304] Fixes latest check-in errors for:
HDFFV-8653
replace non-standard sizeof in the fortran tests with c_sizeof
(1) Removed the overloaded h5_sizeof functions for characters and integer arrays since Sun compilers don't allow them to be passed into a function that uses sizeof.
(2) Requested min. precision for reals to avoid duplicate interfaces when the flag -r8 (or equiv.) is set.
tested:
*jam: intel, -i8 -r8 --enable-fortran2003
*jam: pgi, --enable-fortran2003
*emu: sun, --enable-fortran2003
Diffstat (limited to 'fortran/test/tf_F08.f90')
| -rw-r--r-- | fortran/test/tf_F08.f90 | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/fortran/test/tf_F08.f90 b/fortran/test/tf_F08.f90 index 3ad2820..5583f3f 100644 --- a/fortran/test/tf_F08.f90 +++ b/fortran/test/tf_F08.f90 @@ -43,8 +43,8 @@ MODULE TH5_MISC_PROVISIONAL USE ISO_C_BINDING IMPLICIT NONE - INTEGER, PARAMETER :: sp = KIND(0.0) - INTEGER, PARAMETER :: dp = KIND(0.D0) + INTEGER, PARAMETER :: sp = SELECTED_REAL_KIND(5) ! This should map to REAL*4 on most modern processors + 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 @@ -58,7 +58,7 @@ MODULE TH5_MISC_PROVISIONAL INTERFACE H5_SIZEOF MODULE PROCEDURE H5_SIZEOF_CMPD MODULE PROCEDURE H5_SIZEOF_CHR - MODULE PROCEDURE H5_SIZEOF_I, H5_SIZEOF_IV + MODULE PROCEDURE H5_SIZEOF_I MODULE PROCEDURE H5_SIZEOF_SP,H5_SIZEOF_DP END INTERFACE @@ -100,17 +100,6 @@ CONTAINS END FUNCTION H5_SIZEOF_I -!This definition is needed for Windows DLLs -!DEC$if defined(BUILD_HDF5_DLL) -!DEC$attributes dllexport :: h5_sizeof_iv -!DEC$endif - INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_IV(a) - IMPLICIT NONE - INTEGER, DIMENSION(:), INTENT(in):: a - - H5_SIZEOF_IV = SIZE(a)*storage_size(a(1), c_size_t)/storage_size(c_char_'a',c_size_t) - - END FUNCTION H5_SIZEOF_IV !This definition is needed for Windows DLLs !DEC$if defined(BUILD_HDF5_DLL) |