diff options
author | kmu <kmu@hdfgroup.org> | 2020-01-23 03:30:36 (GMT) |
---|---|---|
committer | kmu <kmu@hdfgroup.org> | 2020-01-23 03:30:36 (GMT) |
commit | 2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8 (patch) | |
tree | 795739e979593ab3b0d0d3b4a6124c1f7049ab50 /testpar/t_2Gio.c | |
parent | 408b9b1f3b8e84ba090c51e665d38eedef32c7ee (diff) | |
parent | d7414053638316081f11fad78474b2c3cde336c5 (diff) | |
download | hdf5-2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8.zip hdf5-2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8.tar.gz hdf5-2de0ce0d8ba2fb58fadefc5d718a3c0fedab25c8.tar.bz2 |
merge and fix conflict
Diffstat (limited to 'testpar/t_2Gio.c')
-rw-r--r-- | testpar/t_2Gio.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c index d48dfca..a49fefe 100644 --- a/testpar/t_2Gio.c +++ b/testpar/t_2Gio.c @@ -552,7 +552,7 @@ dataset_vrfy(hsize_t start[], hsize_t count[], hsize_t stride[], hsize_t block[] #define H5FILE_NAME "hugefile.h5" #define DATASETNAME "dataset" -int MpioTest2G( MPI_Comm comm ) +static int MpioTest2G( MPI_Comm comm ) { /* * HDF5 APIs definitions @@ -3891,8 +3891,6 @@ actual_io_mode_tests(void) { * Programmer: Jonathan Kim * Date: Aug, 2012 */ -#define DSET_NOCOLCAUSE "nocolcause" -#define NELM 2 #define FILE_EXTERNAL "nocolcause_extern.data" static void test_no_collective_cause_mode(int selection_mode) |