mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-02-23 16:20:57 +08:00
[svn-r12270] Purpose: Bug fix (it is quite serious, so I decided to check the fix in)
Description: H5match_types uses reserved "INT" string and writes it to the H5H5fortran_types.f90 file. If application uses Fortran intrinsic INT and HDF5, compilation fails since it becomes redefined in H5H5fortran_types.f90. Solution: Rename INT to Fortran_INTEGER Platforms tested: copper, shanti, heping with g95 Misc. update:
This commit is contained in:
parent
8d5bb57464
commit
f4b3fc64eb
@ -350,13 +350,13 @@ int main()
|
|||||||
|
|
||||||
/* int */
|
/* int */
|
||||||
#if defined H5_FORTRAN_HAS_NATIVE_8
|
#if defined H5_FORTRAN_HAS_NATIVE_8
|
||||||
writeToFiles("INT", "int_f", 8);
|
writeToFiles("Fortran_INTEGER", "int_f", 8);
|
||||||
#elif defined H5_FORTRAN_HAS_NATIVE_4
|
#elif defined H5_FORTRAN_HAS_NATIVE_4
|
||||||
writeToFiles("INT", "int_f", 4);
|
writeToFiles("Fortran_INTEGER", "int_f", 4);
|
||||||
#elif defined H5_FORTRAN_HAS_NATIVE_2
|
#elif defined H5_FORTRAN_HAS_NATIVE_2
|
||||||
writeToFiles("INT", "int_f", 2);
|
writeToFiles("Fortran_INTEGER", "int_f", 2);
|
||||||
#elif defined H5_FORTRAN_HAS_NATIVE_1
|
#elif defined H5_FORTRAN_HAS_NATIVE_1
|
||||||
writeToFiles("INT", "int_f", 1);
|
writeToFiles("Fortran_INTEGER", "int_f", 1);
|
||||||
#else
|
#else
|
||||||
/* Error: couldn't find a size for int */
|
/* Error: couldn't find a size for int */
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user