Merged HDFFV-10929_2GB_testing to hdf5_1_12

This commit is contained in:
Richard Warren
2019-12-06 16:42:36 -05:00
parent 9d24eefaf7
commit 0c06cfc6ef
128 changed files with 6515 additions and 817 deletions

View File

@@ -2245,6 +2245,9 @@ 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)
{
@@ -2305,6 +2308,7 @@ static hsize_t character_compare_opt(unsigned char *mem1, unsigned char *mem2,
return nfound;
}
#pragma GCC diagnostic pop
/*-------------------------------------------------------------------------
* Function: diff_float