diff options
| -rw-r--r-- | src/H5FDmpio.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/H5FDmpio.h b/src/H5FDmpio.h index dab4d5e..fb61498 100644 --- a/src/H5FDmpio.h +++ b/src/H5FDmpio.h @@ -46,13 +46,8 @@ __DLL__ htri_t H5FD_mpio_tas_allsame(H5FD_t *_file, hbool_t newval); __DLL__ MPI_Comm H5FD_mpio_communicator(H5FD_t *_file); __DLL__ herr_t H5FD_mpio_setup(H5FD_t *_file, MPI_Datatype btype, MPI_Datatype ftype, haddr_t disp, hbool_t use_types); -<<<<<<<<<<<<<< variant A -__DLL__herr_t H5FD_mpio_wait_for_left_neighbor(H5FD_t *file); -__DLL__herr_t H5FD_mpio_signal_right_neighbor(H5FD_t *file); ->>>>>>>>>>>>>> variant B __DLL__ herr_t H5FD_mpio_wait_for_left_neighbor(H5FD_t *file); __DLL__ herr_t H5FD_mpio_signal_right_neighbor(H5FD_t *file); -======= end of combination #endif /*HAVE_PARALLEL*/ |