diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2017-11-27 20:35:36 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2017-11-27 20:35:36 (GMT) |
| commit | 4dfffe1c78c36b8633ef2f80f580feac787df8d6 (patch) | |
| tree | e93efe342ecc2e7da27a7a68175efaa4468c8a05 /test/th5o.c | |
| parent | f116545ce465181928ca97214b9cfa87092a3ee9 (diff) | |
| parent | 9fdd984cdea6fce8b5fdd16a7ccc3cc9bbca6fed (diff) | |
| download | hdf5-4dfffe1c78c36b8633ef2f80f580feac787df8d6.zip hdf5-4dfffe1c78c36b8633ef2f80f580feac787df8d6.tar.gz hdf5-4dfffe1c78c36b8633ef2f80f580feac787df8d6.tar.bz2 | |
Merge pull request #798 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:misc_windows_warnings to develop
* commit '9fdd984cdea6fce8b5fdd16a7ccc3cc9bbca6fed':
Changed casts to const void *
Casted pointers to void to quiet warnings on Linux.
Added CHECK_PTR_EQ macro to testhdf5 to quiet cast warnings on Windows.
Fixed misc Warnings flagged by VS2017.
Diffstat (limited to 'test/th5o.c')
| -rw-r--r-- | test/th5o.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/th5o.c b/test/th5o.c index 4baac20..144ea4c 100644 --- a/test/th5o.c +++ b/test/th5o.c @@ -783,9 +783,9 @@ test_h5o_link(void) /* Allocate memory buffers */ /* (These are treated as 2-D buffers) */ wdata = (int *)HDmalloc((size_t)(TEST6_DIM1 * TEST6_DIM2) * sizeof(int)); - CHECK(wdata, NULL, "HDmalloc"); + CHECK_PTR(wdata, "HDmalloc"); rdata = (int *)HDmalloc((size_t)(TEST6_DIM1 * TEST6_DIM2) * sizeof(int)); - CHECK(rdata, NULL, "HDmalloc"); + CHECK_PTR(rdata, "HDmalloc"); /* Initialize the raw data */ for(i = n = 0; i < (TEST6_DIM1 * TEST6_DIM2); i++) |