diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2020-05-20 14:26:53 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2020-05-20 14:26:53 (GMT) |
commit | decfe1ae5b3a37edea6bb97c07b69019fd17d339 (patch) | |
tree | 3ffbc58ec81984890ca309cf069543ac75660961 | |
parent | aa3cb25a6a519f189d07d1bc458d6eb233c16b41 (diff) | |
parent | af1cd63111adce03f81e2e497890080ef1f51113 (diff) | |
download | hdf5-decfe1ae5b3a37edea6bb97c07b69019fd17d339.zip hdf5-decfe1ae5b3a37edea6bb97c07b69019fd17d339.tar.gz hdf5-decfe1ae5b3a37edea6bb97c07b69019fd17d339.tar.bz2 |
Merge pull request #2596 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'af1cd63111adce03f81e2e497890080ef1f51113':
Update MANIFEST for removal of older warnings files. Fix max_index in make_vers - must equal current version.
-DH5_NO_DEPRECATED_SYMBOLS can no longer be tested with a previous version API: H5Version.h now has a check that disallows it.
-rw-r--r-- | MANIFEST | 20 | ||||
-rwxr-xr-x | bin/make_vers | 4 | ||||
-rw-r--r-- | examples/testh5cc.sh.in | 3 |
3 files changed, 4 insertions, 23 deletions
@@ -149,16 +149,7 @@ ./config/clang-warnings/error-general ./config/clang-warnings/general ./config/clang-warnings/no-developer-general -./config/gnu-warnings/4.2-4.3 -./config/gnu-warnings/4.2-4.4 -./config/gnu-warnings/4.2-4.6 -./config/gnu-warnings/4.2-4.last -./config/gnu-warnings/4.3 -./config/gnu-warnings/4.4 -./config/gnu-warnings/4.5 -./config/gnu-warnings/4.5-4.6 -./config/gnu-warnings/4.6 -./config/gnu-warnings/4.7 +./config/gnu-warnings/4.8-4.last ./config/gnu-warnings/4.8 ./config/gnu-warnings/4.9 ./config/gnu-warnings/5 @@ -171,9 +162,6 @@ ./config/gnu-warnings/cxx-5 ./config/gnu-warnings/cxx-error-5 ./config/gnu-warnings/cxx-error-general -./config/gnu-warnings/developer-4.5 -./config/gnu-warnings/developer-4.6 -./config/gnu-warnings/developer-4.7 ./config/gnu-warnings/developer-4.8 ./config/gnu-warnings/developer-7 ./config/gnu-warnings/developer-8 @@ -183,16 +171,10 @@ ./config/gnu-warnings/error-general ./config/gnu-warnings/general ./config/gnu-warnings/gfort-general -./config/gnu-warnings/gfort-4.4 -./config/gnu-warnings/gfort-4.5 -./config/gnu-warnings/gfort-4.7 ./config/gnu-warnings/gfort-4.8 ./config/gnu-warnings/gfort-5 ./config/gnu-warnings/gfort-6 ./config/gnu-warnings/gfort-8 -./config/gnu-warnings/no-developer-4.5 -./config/gnu-warnings/no-developer-4.6 -./config/gnu-warnings/no-developer-4.7 ./config/gnu-warnings/no-developer-4.8 ./config/gnu-warnings/no-developer-8 ./config/gnu-warnings/no-developer-general diff --git a/bin/make_vers b/bin/make_vers index d2dca4e..478e1df 100755 --- a/bin/make_vers +++ b/bin/make_vers @@ -8,8 +8,8 @@ use warnings; # is added (like support for 1.4, etc), the min_sup_idx parameter will # need to be decremented. - QAK) -# Max. library "index" (0 = v1.0, 1 = 1.2, 2 = 1.4, 3 = 1.6, 4 = 1.8, 5 = 1.10, 6 = 1.12, etc) -$max_idx = 6; +# Max. library "index" (0 = v1.0, 1 = 1.2, 2 = 1.4, 3 = 1.6, 4 = 1.8, 5 = 1.10, etc) +$max_idx = 5; # Min. supported previous library version "index" (0 = v1.0, 1 = 1.2, etc) $min_sup_idx = 3; diff --git a/examples/testh5cc.sh.in b/examples/testh5cc.sh.in index 800d4d4..ddd37e7 100644 --- a/examples/testh5cc.sh.in +++ b/examples/testh5cc.sh.in @@ -308,7 +308,7 @@ echo "***"Version compatibility tests. # If H5_NO_DEPRECATED_SYMBOLS; # then only v18main works. # else if H5_USE_16_API_DEFAULT; -# then v16main works and -DH5_NO_DEPRECATED_SYMBOLS v18main also works. +# then v16main works. # else v18main works and -DH5_USE_16_API_DEFAULT v16main also works. # if [ -n "$H5_USE_16_API_DEFAULT" ]; then @@ -326,7 +326,6 @@ if [ -n "$H5_NO_DEPRECATED_SYMBOLS" ]; then TOOLTEST $v18main elif [ -n "$H5_USE_16_API_DEFAULT" ]; then TOOLTEST $v16main - TOOLTEST -DH5_NO_DEPRECATED_SYMBOLS $v18main else TOOLTEST -DH5_USE_16_API_DEFAULT $v16main TOOLTEST $v18main |