diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-03-20 20:00:06 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-20 20:00:06 (GMT) |
| commit | b766e5f96f26805e8c92e718a05f42d073912711 (patch) | |
| tree | 0b7c992bc24581608d308428e25b0f93e86bdd61 /src/H5VM.c | |
| parent | 1ffaa38174b0f784b7ed6a471f40bf0e749ceac3 (diff) | |
| download | hdf5-b766e5f96f26805e8c92e718a05f42d073912711.zip hdf5-b766e5f96f26805e8c92e718a05f42d073912711.tar.gz hdf5-b766e5f96f26805e8c92e718a05f42d073912711.tar.bz2 | |
Normalize platform-independence code w/ develop (#2615)
* Normalize platform-independence code w/ develop
* Use C99 types and functions in lieu of C89 work-arounds
* Align key files with develop
- H5public.h
- H5private.h
- H5system.c
- H5win32defs.h
* Minor fixes elsewhere to support changes in above files
* Incidentally brings Fortran mod directory settings file change over
This does NOT change the configure/build files. Those will still do the
checks needed for the C89 work-around cruft until the perf and perform
code gets cleaned up.
* Add C++98 fixes
* Explicitly set -std=c++98 in Autotools
* Do not include cstdlib in H5public.h (requires C++11)
* Remove redundant stdbool.h include
* Fix alarm issues on Windows
* Bring parallel alarm() changes from develop
Diffstat (limited to 'src/H5VM.c')
| -rw-r--r-- | src/H5VM.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -609,7 +609,7 @@ H5VM_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size, const hsize FUNC_ENTER_NOAPI_NOINIT_NOERR - HDassert(elmt_size < SIZET_MAX); + HDassert(elmt_size < SIZE_MAX); H5VM_vector_cpy(n, idx, size); nelmts = H5VM_vector_reduce_product(n, size); @@ -667,7 +667,7 @@ H5VM_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *size, const hsize FUNC_ENTER_NOAPI_NOINIT_NOERR - HDassert(elmt_size < SIZET_MAX); + HDassert(elmt_size < SIZE_MAX); if (n) { H5VM_vector_cpy(n, idx, size); @@ -733,7 +733,7 @@ H5VM_stride_copy_s(unsigned n, hsize_t elmt_size, const hsize_t *size, const hss FUNC_ENTER_NOAPI_NOINIT_NOERR - HDassert(elmt_size < SIZET_MAX); + HDassert(elmt_size < SIZE_MAX); if (n) { H5VM_vector_cpy(n, idx, size); @@ -802,7 +802,7 @@ H5VM__stride_copy2(hsize_t nelmts, hsize_t elmt_size, FUNC_ENTER_STATIC_NOERR - HDassert(elmt_size < SIZET_MAX); + HDassert(elmt_size < SIZE_MAX); HDassert(dst_n > 0); HDassert(src_n > 0); @@ -866,8 +866,8 @@ H5VM_array_fill(void *_dst, const void *src, size_t size, size_t count) HDassert(dst); HDassert(src); - HDassert(size < SIZET_MAX && size > 0); - HDassert(count < SIZET_MAX && count > 0); + HDassert(size < SIZE_MAX && size > 0); + HDassert(count < SIZE_MAX && count > 0); H5MM_memcpy(dst, src, size); /* copy first item */ |