summaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorkmu <kmu@hdfgroup.org>2019-12-09 15:18:56 (GMT)
committerkmu <kmu@hdfgroup.org>2019-12-09 15:18:56 (GMT)
commit8b51394f3841012f3c06bf380082a83f66a68168 (patch)
treecfb41461a5f1f9bc14e8f3118ce541e1997aa485 /tools/lib
parent189935ff260cae6fb4e061fa68bd7b93e219c635 (diff)
parent1f871e23b7c3fdec925004f2cd39d3a2cdd8decb (diff)
downloadhdf5-8b51394f3841012f3c06bf380082a83f66a68168.zip
hdf5-8b51394f3841012f3c06bf380082a83f66a68168.tar.gz
hdf5-8b51394f3841012f3c06bf380082a83f66a68168.tar.bz2
Merge branch 'develop' into bugfix/intel_warnings
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/h5diff.c3
-rw-r--r--tools/lib/h5diff_array.c4
-rw-r--r--tools/lib/h5tools_utils.c2
3 files changed, 1 insertions, 8 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index dc33d58..5acdde8 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -258,8 +258,6 @@ free_exclude_path_list(diff_opt_t *opts)
* Parameter:
* table_out [OUT] : return the list
*------------------------------------------------------------------------*/
-#pragma GCC diagnostic push
-#pragma GCC diagnostic warning "-Wunused-but-set-variable"
static void
build_match_list (const char *objname1, trav_info_t *info1, const char *objname2, trav_info_t *info2,
trav_table_t ** table_out, diff_opt_t *opts)
@@ -376,7 +374,6 @@ done:
*table_out = table;
h5difftrace("build_match_list finish\n");
}
-#pragma GCC diagnostic pop
/*-------------------------------------------------------------------------
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 55ad65c..2a45913 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -2245,9 +2245,6 @@ static hsize_t character_compare(char *mem1, char *mem2, hsize_t i, size_t u,
*-------------------------------------------------------------------------
*/
-#pragma GCC diagnostic push
-#pragma GCC diagnostic warning "-Wunused-but-set-variable"
-
static hsize_t character_compare_opt(unsigned char *mem1, unsigned char *mem2,
hsize_t i, int rank, hsize_t *dims, hsize_t *acc, hsize_t *pos, diff_opt_t *opts, const char *obj1, const char *obj2, int *ph)
{
@@ -2308,7 +2305,6 @@ static hsize_t character_compare_opt(unsigned char *mem1, unsigned char *mem2,
return nfound;
}
-#pragma GCC diagnostic pop
/*-------------------------------------------------------------------------
* Function: diff_float
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index 6fc9de4..47ce690 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -1279,7 +1279,7 @@ done:
int
h5tools_set_configured_fapl(hid_t fapl_id,
const char vfd_name[],
- void *fapl_t_ptr H5_ATTR_UNUSED)
+ void *fapl_t_ptr)
{
int ret_value = 1;