summaryrefslogtreecommitdiffstats
path: root/test/dsets.c
diff options
context:
space:
mode:
authorDavid Young <dyoung@hdfgroup.org>2020-01-29 19:51:10 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-01-29 19:51:10 (GMT)
commit1b49ccd7faaf3285ac736ac260f15fe3e6cb69f8 (patch)
treec5f4f7b06142b328c247ecc9eb233e4a6344bb12 /test/dsets.c
parent20c09524ea348f4009555a1cba2731842b9af80e (diff)
parentf19e06b59ee53f17465a7b5974c25c3245a40d9a (diff)
downloadhdf5-1b49ccd7faaf3285ac736ac260f15fe3e6cb69f8.zip
hdf5-1b49ccd7faaf3285ac736ac260f15fe3e6cb69f8.tar.gz
hdf5-1b49ccd7faaf3285ac736ac260f15fe3e6cb69f8.tar.bz2
Merge pull request #2321 in HDFFV/hdf5 from ~DYOUNG/werror:reduce-werror-diffs-3 to develop
* commit 'f19e06b59ee53f17465a7b5974c25c3245a40d9a': testpar/t_2Gio.c: Fix a typo that I think was introduced by a previous warnings PR. An array element was assigned to itself---shape[2]Â =Â shape[2];---instead of being assigned to chunk[2].
Diffstat (limited to 'test/dsets.c')
-rw-r--r--test/dsets.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/dsets.c b/test/dsets.c
index 9926f10..2201d89 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -2331,9 +2331,9 @@ H5_ATTR_UNUSED
hsize_t shuffle_size; /* Size of dataset with shuffle filter */
-#if(defined H5_HAVE_FILTER_DEFLATE | defined H5_HAVE_FILTER_SZIP)
+#if defined(H5_HAVE_FILTER_DEFLATE) || defined(H5_HAVE_FILTER_SZIP)
hsize_t combo_size; /* Size of dataset with multiple filters */
-#endif /* defined H5_HAVE_FILTER_DEFLATE | defined H5_HAVE_FILTER_SZIP */
+#endif /* defined(H5_HAVE_FILTER_DEFLATE) || defined(H5_HAVE_FILTER_SZIP) */
/* test the H5Zget_filter_info function */
if(test_get_filter_info() < 0) goto error;