summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2017-11-03 17:17:36 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2017-11-03 17:17:36 (GMT)
commite0d5972dee0a96c1fa26d8b9f89d7065f28eac70 (patch)
treeb758b608ea8bb2a6c0445703f0d05168cb5ab500
parent54b4c41c7fdf4b623c0ecb06ecd28fe05f5ea9b4 (diff)
parentcea5751e53228eb1ebd05d8fe86e071517bf809b (diff)
downloadhdf5-e0d5972dee0a96c1fa26d8b9f89d7065f28eac70.zip
hdf5-e0d5972dee0a96c1fa26d8b9f89d7065f28eac70.tar.gz
hdf5-e0d5972dee0a96c1fa26d8b9f89d7065f28eac70.tar.bz2
Merge pull request #752 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_10 to hdf5_1_10
* commit 'cea5751e53228eb1ebd05d8fe86e071517bf809b': (28 commits) Fix for Intel 18 Fortran compilation error. Make a fix to allow CMake testing which does not use relative directories. Add missing dir reference New cmake MPI files HDFFV-10321 Correct fortran link var HDFFV-10321 change note added. Correct path Correct path Change to local path Add back Find module and add support files Remove incorrect link var Remove duplicated module Correct usage of MPI vars Convert to use MPI:: for link Correct command usage Change MPI target properties for library Update H5Zfilter_avail note New requirement for test Add a missing declaration for testing Revert "Fix for HDFFFV-10308. Initialize hid_ts in function check_objects and" ...
-rw-r--r--fortran/src/H5f90global.F905
-rw-r--r--release_docs/RELEASE.txt3
2 files changed, 3 insertions, 5 deletions
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index dd2b171..629418a 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -142,10 +142,7 @@ MODULE H5GLOBAL
INTEGER(HID_T), DIMENSION(PREDEF_TYPES_LEN) :: predef_types
EQUIVALENCE (predef_types(1), H5T_NATIVE_INTEGER_KIND(1))
- EQUIVALENCE (predef_types(2), H5T_NATIVE_INTEGER_KIND(2))
- EQUIVALENCE (predef_types(3), H5T_NATIVE_INTEGER_KIND(3))
- EQUIVALENCE (predef_types(4), H5T_NATIVE_INTEGER_KIND(4))
- EQUIVALENCE (predef_types(5), H5T_NATIVE_INTEGER_KIND(5))
+ ! EQUIVALENCE predef_types(2:5) are unnecessary and violate the standard
EQUIVALENCE (predef_types(6), H5T_NATIVE_INTEGER)
EQUIVALENCE (predef_types(7), H5T_NATIVE_REAL)
EQUIVALENCE (predef_types(8), H5T_NATIVE_DOUBLE)
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index f8ed5d0..572b355 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -145,6 +145,7 @@ New Features
(RAW - 2017/10/10, HDFFV-10294)
+
- Large MPI-IO transfers
Previous releases of PHDF5 would fail when attempting to
@@ -167,7 +168,7 @@ New Features
fulfill the original user request without encountering API
errors.
- (RAW - 2017/09/20, HDFFV-8839)
+ (RAW - 2017/09/10, HDFFV-8839)
Fortran Library:
----------------