diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-03-03 20:15:55 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 20:15:55 (GMT) |
| commit | e65814bf8eda709b27a60fe3e396a22e4bc34864 (patch) | |
| tree | c9f9cc67a4dd93453cc4bf7054b5a8192e663337 /test | |
| parent | c14fa9cebf58213bc4e2c0ac87e520c473e14071 (diff) | |
| download | hdf5-e65814bf8eda709b27a60fe3e396a22e4bc34864.zip hdf5-e65814bf8eda709b27a60fe3e396a22e4bc34864.tar.gz hdf5-e65814bf8eda709b27a60fe3e396a22e4bc34864.tar.bz2 | |
1 10 merges from develop (#419)
* HDFFV-10865 - merge from dev, HDFArray perf fix.
* Remove duplicate setting
* Whitespace changes after clang format
* Undo version 11 clang format changes
* Merge CMake changes from develop
* test testing script merge from develop
* Update supported platforms
* PR#3 merge from develop
* Merge gcc 10 diagnostics option from develop
* Merge #318 OSX changes from develop
* Merge small changes from develop
* Minor non-space formatting changes
* #386 copyright corrections for java folder
* Merges from develop
#358 patches from vtk
#361 fix header guard spelling
* Merge updates
#358 patches from vtk
#361 fix header guard spelling
* format fix
* Fix missing underscore and make H5public.h closer to dev
Diffstat (limited to 'test')
| -rw-r--r-- | test/H5srcdir.h | 6 | ||||
| -rw-r--r-- | test/h5test.h | 4 | ||||
| -rw-r--r-- | test/stab.c | 2 | ||||
| -rw-r--r-- | test/tattr.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/test/H5srcdir.h b/test/H5srcdir.h index b2fd341..8cc91d1 100644 --- a/test/H5srcdir.h +++ b/test/H5srcdir.h @@ -17,8 +17,8 @@ * * Purpose: srcdir querying support. */ -#ifndef _H5SRCDIR_H -#define _H5SRCDIR_H +#ifndef H5SRCDIR_H +#define H5SRCDIR_H #ifdef __cplusplus extern "C" { @@ -33,4 +33,4 @@ H5TEST_DLL const char *H5_get_srcdir_filename(const char *filename); } #endif -#endif /* _H5SRCDIR_H */ +#endif /* H5SRCDIR_H */ diff --git a/test/h5test.h b/test/h5test.h index 5b0ab34..73dd1b5 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -17,8 +17,8 @@ * * Purpose: Test support stuff. */ -#ifndef _H5TEST_H -#define _H5TEST_H +#ifndef H5TEST_H +#define H5TEST_H /* * Include required headers. This file tests internal library functions, diff --git a/test/stab.c b/test/stab.c index 8672546..7c94a56 100644 --- a/test/stab.c +++ b/test/stab.c @@ -1273,7 +1273,7 @@ old_api(hid_t fapl) PASSED(); #else /* H5_NO_DEPRECATED_SYMBOLS */ /* Shut compiler up */ - fapl = fapl; + (void)fapl; SKIPPED(); HDputs(" Deprecated API symbols not enabled"); diff --git a/test/tattr.c b/test/tattr.c index a9d059b..bc8fae1 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -4195,8 +4195,8 @@ test_attr_deprec(hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Fclose"); #else /* H5_NO_DEPRECATED_SYMBOLS */ /* Shut compiler up */ - fcpl = fcpl; - fapl = fapl; + (void)fcpl; + (void)fapl; /* Output message about test being skipped */ MESSAGE(5, ("Skipping Test On Deprecated Attribute Routines\n")); |