diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2015-09-18 03:26:14 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2015-09-18 03:26:14 (GMT) |
| commit | c96f6e6400f111e15b0e15e5bdf056788e9544a7 (patch) | |
| tree | f5f382c43f2a0cd964f4e2e7deef9984281935bc /testpar | |
| parent | 92f43d66876979fda3bd68a1fe1cd887146e002e (diff) | |
| download | hdf5-c96f6e6400f111e15b0e15e5bdf056788e9544a7.zip hdf5-c96f6e6400f111e15b0e15e5bdf056788e9544a7.tar.gz hdf5-c96f6e6400f111e15b0e15e5bdf056788e9544a7.tar.bz2 | |
[svn-r27821] Bring revisions #27262 - 27294 from trunk to revise_chunks.
Tested on jam, ostrich, platypus, osx1010test, emu.
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_cache.c | 6 | ||||
| -rw-r--r-- | testpar/t_mpi.c | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c index cc0cb69..9c72949 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -4251,7 +4251,7 @@ setup_cache_for_test(hid_t * fid_ptr, if ( success ) { - if ( H5AC_set_write_done_callback(cache_ptr, do_sync) != SUCCEED ) { + if ( H5AC__set_write_done_callback(cache_ptr, do_sync) != SUCCEED ) { nerrors++; if ( verbose ) { @@ -4266,12 +4266,12 @@ setup_cache_for_test(hid_t * fid_ptr, if ( success ) { - if ( H5AC_set_sync_point_done_callback(cache_ptr, verify_writes) != SUCCEED ) { + if ( H5AC__set_sync_point_done_callback(cache_ptr, verify_writes) != SUCCEED ) { nerrors++; if ( verbose ) { HDfprintf(stdout, - "%d:%s: H5AC_set_sync_point_done_callback failed.\n", + "%d:%s: H5AC__set_sync_point_done_callback failed.\n", world_mpi_rank, FUNC); } } diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c index 7bd2f58..873b952 100644 --- a/testpar/t_mpi.c +++ b/testpar/t_mpi.c @@ -281,7 +281,7 @@ test_mpio_gb_file(char *filename) printf("Skipped GB file range test " "because MPI_Offset cannot support it\n"); }else{ - buf = HDmalloc(MB); + buf = (char *)HDmalloc(MB); VRFY((buf!=NULL), "malloc succeed"); /* open a new file. Remove it first in case it exists. */ @@ -678,10 +678,9 @@ static int test_mpio_derived_dtype(char *filename) { int mpi_err_strlen; int mpi_err; int i; - int nerrors = 0; /* number of errors */ MPI_Datatype etype,filetype; MPI_Datatype adv_filetype,bas_filetype[2]; - MPI_Datatype etypenew, filetypenew; + MPI_Datatype filetypenew; MPI_Offset disp; MPI_Status Status; MPI_Aint adv_disp[2]; @@ -1100,7 +1099,7 @@ main(int argc, char **argv) * calls. By then, MPI calls may not work. */ if (H5dont_atexit() < 0){ - printf("Failed to turn off atexit processing. Continue.\n", mpi_rank); + printf("Failed to turn off atexit processing. Continue.\n"); }; H5open(); if (parse_options(argc, argv) != 0){ |