summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2021-02-20 14:11:24 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2021-02-20 14:11:24 (GMT)
commita544ef1441cc91f5d55d47deb13a0e90058825e5 (patch)
treed8ef3918808427bd4c0610d7047fc0301c6a9075 /hl
parent8d4a9d589b816276f729ef2091cb7efb7e31f034 (diff)
parent9dc3ddaad57625ee7f15eab912b48bee7ed0f325 (diff)
downloadhdf5-a544ef1441cc91f5d55d47deb13a0e90058825e5.zip
hdf5-a544ef1441cc91f5d55d47deb13a0e90058825e5.tar.gz
hdf5-a544ef1441cc91f5d55d47deb13a0e90058825e5.tar.bz2
Merge branch 'hdf5_1_12' of https://github.com/HDFGroup/hdf5 into hdf5_1_12
Diffstat (limited to 'hl')
-rw-r--r--hl/examples/ex_ds1.c4
-rw-r--r--hl/fortran/examples/ex_ds1.f903
-rw-r--r--hl/src/H5LTanalyze.c4
-rw-r--r--hl/src/H5LTparse.c4
4 files changed, 11 insertions, 4 deletions
diff --git a/hl/examples/ex_ds1.c b/hl/examples/ex_ds1.c
index 73578f1..d6890fa 100644
--- a/hl/examples/ex_ds1.c
+++ b/hl/examples/ex_ds1.c
@@ -91,9 +91,11 @@ main(void)
if (H5DSattach_scale(did, dsid, DIM1) < 0)
goto out;
- /* close DS id */
+ /* close DS ids */
if (H5Dclose(dsid) < 0)
goto out;
+ if (H5Dclose(did) < 0)
+ goto out;
/* close file */
H5Fclose(fid);
diff --git a/hl/fortran/examples/ex_ds1.f90 b/hl/fortran/examples/ex_ds1.f90
index 7040950..d1ff678 100644
--- a/hl/fortran/examples/ex_ds1.f90
+++ b/hl/fortran/examples/ex_ds1.f90
@@ -180,8 +180,9 @@ PROGRAM example_ds
WRITE(*,'(/,5X,A,I0,2A,/)') 'Dimension Scale Label for dimension ', DIM2, ' is ... ', label(1:label_len)
- ! close DS id
+ ! close DS ids
CALL H5Dclose_f(dsid, err)
+ CALL H5Dclose_f(did, err)
! close file
CALL H5Fclose_f(fid, err)
diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c
index e35f20b..6673f5f 100644
--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
@@ -2,7 +2,6 @@
#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
-#pragma GCC diagnostic ignored "-Wlarger-than="
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
#pragma GCC diagnostic ignored "-Wnested-externs"
#pragma GCC diagnostic ignored "-Wold-style-definition"
@@ -11,8 +10,11 @@
#pragma GCC diagnostic ignored "-Wsign-conversion"
#pragma GCC diagnostic ignored "-Wstrict-overflow"
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#if !defined (__clang__)
+#pragma GCC diagnostic ignored "-Wlarger-than="
#pragma GCC diagnostic ignored "-Wsuggest-attribute=const"
#pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
+#endif
#pragma GCC diagnostic ignored "-Wswitch-default"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-macros"
diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c
index 80de0a2..2ef133f 100644
--- a/hl/src/H5LTparse.c
+++ b/hl/src/H5LTparse.c
@@ -2,7 +2,6 @@
#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
-#pragma GCC diagnostic ignored "-Wlarger-than="
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
#pragma GCC diagnostic ignored "-Wnested-externs"
#pragma GCC diagnostic ignored "-Wold-style-definition"
@@ -11,8 +10,11 @@
#pragma GCC diagnostic ignored "-Wsign-conversion"
#pragma GCC diagnostic ignored "-Wstrict-overflow"
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#if !defined (__clang__)
+#pragma GCC diagnostic ignored "-Wlarger-than="
#pragma GCC diagnostic ignored "-Wsuggest-attribute=const"
#pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
+#endif
#pragma GCC diagnostic ignored "-Wswitch-default"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-macros"