diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-09-18 17:27:15 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-09-18 17:27:15 (GMT) |
| commit | efaf7dea67a8c861123952c37e5cf6ac210116e9 (patch) | |
| tree | f7b4d8d7131efb3354884cbb691561857ffe0941 /fortran | |
| parent | 2a6053435c5eacb68aec6c5b8f03d62f4d789e43 (diff) | |
| download | hdf5-efaf7dea67a8c861123952c37e5cf6ac210116e9.zip hdf5-efaf7dea67a8c861123952c37e5cf6ac210116e9.tar.gz hdf5-efaf7dea67a8c861123952c37e5cf6ac210116e9.tar.bz2 | |
HDFFV-10903 merge dev changes to 1.10
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/src/H5Pff.F90 | 2 | ||||
| -rw-r--r-- | fortran/src/H5_ff.F90 | 1 | ||||
| -rw-r--r-- | fortran/test/tH5O_F03.F90 | 3 | ||||
| -rw-r--r-- | fortran/testpar/ptest.f90 | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90 index 13a2953..f170e5f 100644 --- a/fortran/src/H5Pff.F90 +++ b/fortran/src/H5Pff.F90 @@ -9,7 +9,7 @@ ! COPYRIGHT ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * ! Copyright by The HDF Group. * -! Copyright by the Board of Trustees of the University of Illinois. *S +! Copyright by the Board of Trustees of the University of Illinois. * ! All rights reserved. * ! * ! This file is part of HDF5. The full HDF5 copyright notice, including * diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90 index 84529e4..7cd073d 100644 --- a/fortran/src/H5_ff.F90 +++ b/fortran/src/H5_ff.F90 @@ -129,6 +129,7 @@ MODULE H5LIB ! INTEGER, PARAMETER :: H5T_FLAGS_LEN = 35 INTEGER, DIMENSION(1:H5T_FLAGS_LEN) :: H5T_flags + ! ! H5Z flags declaration ! diff --git a/fortran/test/tH5O_F03.F90 b/fortran/test/tH5O_F03.F90 index d1a9ddb..bc3668c 100644 --- a/fortran/test/tH5O_F03.F90 +++ b/fortran/test/tH5O_F03.F90 @@ -270,12 +270,9 @@ CONTAINS ! A(8) = tm_yday int days since January 1 0-365 ! A(9) = tm_isdst int Daylight Saving Time flag ! - INTEGER(C_INT), DIMENSION(:), POINTER :: c_atime, c_btime, c_ctime, c_mtime - INTEGER(C_INT), DIMENSION(1:8) :: atime, btime, ctime, mtime INTEGER :: len, i INTEGER :: idx INTEGER :: ierr - TYPE(C_PTR) :: cptr visit_obj_cb = 0 diff --git a/fortran/testpar/ptest.f90 b/fortran/testpar/ptest.f90 index 14ac3b2..3b07f21 100644 --- a/fortran/testpar/ptest.f90 +++ b/fortran/testpar/ptest.f90 @@ -16,7 +16,7 @@ ! PROGRAM parallel_test - USE hdf5 + USE HDF5 USE MPI USE TH5_MISC |