summaryrefslogtreecommitdiffstats
path: root/test/dsets.c
diff options
context:
space:
mode:
authorDavid Young <dyoung@hdfgroup.org>2020-01-29 17:43:55 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-01-29 17:44:39 (GMT)
commitf19e06b59ee53f17465a7b5974c25c3245a40d9a (patch)
tree20cf79e0cbb4b60ba48933b19cb1200a5046f635 /test/dsets.c
parentf554a4fb5465cfd539ad7bd0310adddf88db6708 (diff)
downloadhdf5-f19e06b59ee53f17465a7b5974c25c3245a40d9a.zip
hdf5-f19e06b59ee53f17465a7b5974c25c3245a40d9a.tar.gz
hdf5-f19e06b59ee53f17465a7b5974c25c3245a40d9a.tar.bz2
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]. fortran/src/H5Pf.c: move conditional compilation controlled by H5_NO_DEPRECATED_SYMBOLS outside of a function for readability. fortran/src/H5match_types.c: put a variable's declaration under the same conditional compilation (H5_FORTRAN_HAVE_C_LONG_DOUBLE) as its use. For now, skip compilation of some unused debug dump routines in the JNI. While I'm in the JNI, delete a set-but-unused variable. src/H5Z.c: condition a variable declaration on H5_NO_DEPRECATED_SYMBOLS so that it's not declared but unused or vice versa. test/cache_common.h: add an #include in to get some symbols we need to avoid implicit declaration warnings. test/dsets.c: use a more conventional conditional-compilation syntax. test/dt_arith.c, test/fillval.c: initialize a bunch of uninitialized variables before use. test/vfd.c: pass the expected type of `void **` to posix_memalign(3) instead of `int **`. testpar/t_bigio.c: explicitly compare with 0 instead of using ! when "equal to 0?" is the question not "is false?" Repair some indentation while I'm here. testpar/testpar.h: repair misaligned line-continuation backslashes in a macro that probably should be a function so that we don't have to fiddle with the line continuation to begin with. tools/src/h5repack/h5repack_main.c: fix some compiler fussing about enums. tools/test/perform/pio_engine.c: the compiler fusses if you cast a function call returning double directly to off_t. It's ok if you cast a variable that's a double to off_t, however. Write and use a new function, sqrto(), to avoid the cast warnings.
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;