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 /testpar | |
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 'testpar')
-rw-r--r-- | testpar/t_bigio.c | 4 | ||||
-rw-r--r-- | testpar/t_filters_parallel.c | 4 | ||||
-rw-r--r-- | testpar/t_mpi.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c index 146d815..d122f73 100644 --- a/testpar/t_bigio.c +++ b/testpar/t_bigio.c @@ -1849,7 +1849,7 @@ main(int argc, char **argv) HDprintf("Failed to turn off atexit processing. Continue.\n"); /* set alarm. */ - ALARM_ON; + TestAlarmOn(); ExpressMode = do_express_test(mpi_rank_g); @@ -1872,7 +1872,7 @@ main(int argc, char **argv) } /* turn off alarm */ - ALARM_OFF; + TestAlarmOff(); if (mpi_rank_g == 0) HDremove(FILENAME[0]); diff --git a/testpar/t_filters_parallel.c b/testpar/t_filters_parallel.c index 3bd52a4..568fb48 100644 --- a/testpar/t_filters_parallel.c +++ b/testpar/t_filters_parallel.c @@ -8799,7 +8799,7 @@ main(int argc, char **argv) if (VERBOSE_MED) h5_show_hostname(); - ALARM_ON; + TestAlarmOn(); num_filters = ARRAY_SIZE(filterIDs); @@ -8967,7 +8967,7 @@ exit: if (MAINPROCESS) HDprintf("*** %d TEST ERROR%s OCCURRED ***\n", nerrors, nerrors > 1 ? "S" : ""); - ALARM_OFF; + TestAlarmOff(); h5_clean_files(FILENAME, fapl_id); fapl_id = H5I_INVALID_HID; diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c index 072e230..8853863 100644 --- a/testpar/t_mpi.c +++ b/testpar/t_mpi.c @@ -1095,7 +1095,7 @@ main(int argc, char **argv) H5Pset_fapl_mpio(fapl, MPI_COMM_WORLD, MPI_INFO_NULL); /* set alarm. */ - ALARM_ON; + TestAlarmOn(); /*======================================= * MPIO 1 write Many read test @@ -1204,7 +1204,7 @@ finish: } /* turn off alarm */ - ALARM_OFF; + TestAlarmOff(); h5_clean_files(FILENAME, fapl); H5close(); |