diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2021-04-01 20:14:21 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-01 20:14:21 (GMT) |
commit | 87d18137ceed7eae1ca7009dda6f4cf2841ff195 (patch) | |
tree | 291983f4bc5f9230bf53564e8555272319d382aa /java/src | |
parent | df75d35cc5295b03dc305ca7e5495fece5737d30 (diff) | |
download | hdf5-87d18137ceed7eae1ca7009dda6f4cf2841ff195.zip hdf5-87d18137ceed7eae1ca7009dda6f4cf2841ff195.tar.gz hdf5-87d18137ceed7eae1ca7009dda6f4cf2841ff195.tar.bz2 |
Hdf5 merge issue 487 v110 (#533)
* Cleans up a couple of MSVC warnings in testhdf5 (#475)
* Fixes a few testhdf5 warnings raised in Visual Studio
Visual Studio is grumpier about treating pointers like integers than
gcc.
* Committing clang-format changes
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Fix typos and grammar errors. (#476)
* Suppresses the tcheck_version test's abort dialog on Windows (#477)
* Suppresses the tcheck_version test's abort dialog on Windows
Windows raises a modal abort/retry/ignore dialog box when CRT
calls abort(). This change installs a report hook that suppresses
the dialog so that the CMake tests don't time out waiting for a
nonexistent user to click a dialog box.
* Committing clang-format changes
* Removes __cdecl from callback
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Committing clang-format changes
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org>
Diffstat (limited to 'java/src')
-rw-r--r-- | java/src/jni/h5util.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c index 567751a..0b01411 100644 --- a/java/src/jni/h5util.c +++ b/java/src/jni/h5util.c @@ -1324,7 +1324,10 @@ h5str_dump_region_blocks(JNIEnv *env, h5str_t *str, hid_t region_space, hid_t re /* * This function fails if the region does not have blocks. */ - H5E_BEGIN_TRY { nblocks = H5Sget_select_hyper_nblocks(region_space); } + H5E_BEGIN_TRY + { + nblocks = H5Sget_select_hyper_nblocks(region_space); + } H5E_END_TRY; if (nblocks <= 0) { @@ -1497,7 +1500,10 @@ h5str_dump_region_points(JNIEnv *env, h5str_t *str, hid_t region_space, hid_t re /* * This function fails if the region does not have points. */ - H5E_BEGIN_TRY { npoints = H5Sget_select_elem_npoints(region_space); } + H5E_BEGIN_TRY + { + npoints = H5Sget_select_elem_npoints(region_space); + } H5E_END_TRY; if (npoints <= 0) { |