diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-06-17 11:48:34 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-06-17 11:48:34 (GMT) |
| commit | fb27787c2abb889a2184bb39eead626a144117d0 (patch) | |
| tree | 7ad16361ac8b2382f0ccf72ce47aae020fed688c /c++/test | |
| parent | 984ecb72c2fa62d233383b24047e04061754ae34 (diff) | |
| parent | 6e9e9e0dd200979642de8d2a2bce2f66f9728237 (diff) | |
| download | hdf5-fb27787c2abb889a2184bb39eead626a144117d0.zip hdf5-fb27787c2abb889a2184bb39eead626a144117d0.tar.gz hdf5-fb27787c2abb889a2184bb39eead626a144117d0.tar.bz2 | |
[svn-r27222] Merge of r27035-27221 from the trunk.
Tested on 64-bit linux VM:
Serial: C++ and Fortran 2003
Parallel: Fortran
Diffstat (limited to 'c++/test')
| -rw-r--r-- | c++/test/dsets.cpp | 4 | ||||
| -rw-r--r-- | c++/test/tfilter.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp index 9f1916d..e57e50e 100644 --- a/c++/test/dsets.cpp +++ b/c++/test/dsets.cpp @@ -61,7 +61,7 @@ const int H5Z_FILTER_BOGUS = 305; static size_t filter_bogus(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf); -// UNUSED variables caused warning, but taking them out caused failure. +// H5_ATTR_UNUSED variables caused warning, but taking them out caused failure. /*------------------------------------------------------------------------- * Function: test_create @@ -462,7 +462,7 @@ static size_t filter_bogus(unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[], size_t nbytes, size_t *buf_size, void **buf) -// UNUSED variables caused warning, but taking them out caused failure. +// H5_ATTR_UNUSED variables caused warning, but taking them out caused failure. { return nbytes; } diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp index 3edb83a..ff3901d 100644 --- a/c++/test/tfilter.cpp +++ b/c++/test/tfilter.cpp @@ -59,7 +59,7 @@ static herr_t test_filter_internal(hid_t fid, const char *name, hid_t dcpl, /* Temporary filter IDs used for testing */ const int H5Z_FILTER_BOGUS = 305; -#if 0 // UNUSED variables caused warning, so duplicated below with NULL instead +#if 0 // H5_ATTR_UNUSED variables caused warning, so duplicated below with NULL instead static size_t filter_bogus(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf); #endif @@ -92,10 +92,10 @@ const H5Z_class2_t H5Z_BOGUS[1] = {{ *------------------------------------------------------------------------- */ static size_t -#if 0 // UNUSED variables caused warning, so duplicated below with NULL instead -filter_bogus(unsigned int UNUSED flags, size_t UNUSED cd_nelmts, - const unsigned int UNUSED *cd_values, size_t nbytes, - size_t UNUSED *buf_size, void UNUSED **buf) +#if 0 // H5_ATTR_UNUSED variables caused warning, so duplicated below with NULL instead +filter_bogus(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts, + const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes, + size_t H5_ATTR_UNUSED *buf_size, void H5_ATTR_UNUSED **buf) #endif filter_bogus(size_t nbytes) { |