diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2016-08-16 18:26:26 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2016-08-16 18:26:26 (GMT) |
| commit | b6c989a9173f0f9808a98ecfeb624870a7ab3c2c (patch) | |
| tree | 89d18c95898adf1dcc26922b513aa925ab3e35cd /fortran | |
| parent | 62ad9411ba387e2b940ea0582ed7dc53e75d8ac5 (diff) | |
| download | hdf5-b6c989a9173f0f9808a98ecfeb624870a7ab3c2c.zip hdf5-b6c989a9173f0f9808a98ecfeb624870a7ab3c2c.tar.gz hdf5-b6c989a9173f0f9808a98ecfeb624870a7ab3c2c.tar.bz2 | |
[svn-r30294] Removed the use of C_sizeof, since it causes issues with the NAG compiler.
Tested: jelly (gnu 4.8.3)
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/test/Makefile.am | 12 | ||||
| -rw-r--r-- | fortran/test/tf_F08.f90 | 7 |
2 files changed, 6 insertions, 13 deletions
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am index 735ab7a..95745e2 100644 --- a/fortran/test/Makefile.am +++ b/fortran/test/Makefile.am @@ -54,17 +54,13 @@ endif check_PROGRAMS=$(TEST_PROG) if FORTRAN_HAVE_STORAGE_SIZE -if FORTRAN_HAVE_C_SIZEOF libh5test_fortran_la_SOURCES = tf_F08.f90 else + if FORTRAN_2003_CONDITIONAL_F libh5test_fortran_la_SOURCES = tf_F03.f90 -endif -else -if FORTRAN_2003_CONDITIONAL_F - libh5test_fortran_la_SOURCES = tf_F03.f90 -else - libh5test_fortran_la_SOURCES = tf_F90.f90 -endif + else + libh5test_fortran_la_SOURCES = tf_F90.f90 + endif endif # tf.f90 depends on either tf_F08.f90 or tf_F03.f90 so they need to be diff --git a/fortran/test/tf_F08.f90 b/fortran/test/tf_F08.f90 index fb2e392..9844702 100644 --- a/fortran/test/tf_F08.f90 +++ b/fortran/test/tf_F08.f90 @@ -29,13 +29,11 @@ ! NOTES ! This file contains "sizeof" functions that are F2008 standard compliant ! and replace the non-standard 'SIZEOF' functions found in the file tf_F03. -! Unfortunity we need to wrap the C_SIZEOF/STORAGE_SIZE functions to handle different +! Unfortunity we need to wrap the STORAGE_SIZE functions to handle different ! data types from the various tests. -! -! F08+TS29113 requires C interoperable variable as argument for C_SIZEOF. ! ! This file will be build instead of tf_F03.f90 if the intrinsic fortran -! function C_SIZEOF/STORAGE_SIZE is found during configure. +! function STORAGE_SIZE is found during configure. ! !***** MODULE TH5_MISC_PROVISIONAL @@ -72,7 +70,6 @@ CONTAINS IMPLICIT NONE TYPE(comp_datatype), INTENT(in) :: a - !H5_SIZEOF_CMPD = C_SIZEOF(a) H5_SIZEOF_CMPD = storage_size(a, c_size_t)/storage_size(c_char_'a',c_size_t) END FUNCTION H5_SIZEOF_CMPD |