diff options
author | kmu <kmu@hdfgroup.org> | 2020-01-14 17:28:27 (GMT) |
---|---|---|
committer | kmu <kmu@hdfgroup.org> | 2020-01-14 17:28:27 (GMT) |
commit | d46ea2d08af456f1cfaf6c6fd3060f39b92be8de (patch) | |
tree | 3b7ce8804ae917fd71e995a39b4ccb08d2aa7169 /src/H5Sselect.c | |
parent | 156baee37112996291f9ff07760be047d0e03c76 (diff) | |
parent | 71b817038d8cd82163cf71119873b2ba65a2c81b (diff) | |
download | hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.zip hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.tar.gz hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.tar.bz2 |
merge and fix conflicts
Diffstat (limited to 'src/H5Sselect.c')
-rw-r--r-- | src/H5Sselect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 6c8b898..9814e38 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -431,7 +431,7 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -H5_ATTR_PURE hssize_t +H5_ATTR_PURE hsize_t H5S_get_select_npoints(const H5S_t *space) { FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -439,7 +439,7 @@ H5S_get_select_npoints(const H5S_t *space) /* Check args */ HDassert(space); - FUNC_LEAVE_NOAPI((hssize_t)space->select.num_elem) + FUNC_LEAVE_NOAPI(space->select.num_elem) } /* end H5S_get_select_npoints() */ |