--- ParaView-3.4.0/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx.hdf5-1.8.2 2009-02-24 14:13:53.000000000 -0700 +++ ParaView-3.4.0/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2009-02-24 15:34:49.000000000 -0700 @@ -133,9 +133,15 @@ static herr_t H5FD_dsm_flush(H5FD_t *_file); #endif static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2); +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type); +static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr); +static haddr_t H5FD_dsm_get_eof(const H5FD_t *_file); +#else static haddr_t H5FD_dsm_get_eoa(H5FD_t *_file); static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr); static haddr_t H5FD_dsm_get_eof(H5FD_t *_file); +#endif static herr_t H5FD_dsm_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, DSM_HSIZE_T size, void *buf); static herr_t H5FD_dsm_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, @@ -160,6 +166,9 @@ H5FD_dsm_close, /*close */ H5FD_dsm_cmp, /*cmp */ NULL, /*query */ +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>9)||((H5_VERS_MINOR==8)&&(H5_VERS_RELEASE>=2)))) + NULL, /*get_type_map */ +#endif NULL, /*alloc */ NULL, /*free */ H5FD_dsm_get_eoa, /*get_eoa */ @@ -169,6 +178,9 @@ H5FD_dsm_read, /*read */ H5FD_dsm_write, /*write */ NULL, /*flush */ +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&((H5_VERS_MINOR>9)||((H5_VERS_MINOR==8)&&(H5_VERS_RELEASE>=2)))) + NULL, /*truncate */ +#endif NULL, /*lock */ NULL, /*unlock */ H5FD_FLMAP_SINGLE /*fl_map */ @@ -595,7 +607,11 @@ *------------------------------------------------------------------------- */ static haddr_t +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t type) +#else H5FD_dsm_get_eoa(H5FD_t *_file) +#endif { H5FD_dsm_t *file = (H5FD_dsm_t*)_file; @@ -623,7 +639,11 @@ *------------------------------------------------------------------------- */ static herr_t +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr) +#else H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr) +#endif { H5FD_dsm_t *file = (H5FD_dsm_t*)_file; @@ -664,7 +684,11 @@ *------------------------------------------------------------------------- */ static haddr_t +#if (H5_VERS_MAJOR>1)||((H5_VERS_MAJOR==1)&&(H5_VERS_MINOR>=8)) +H5FD_dsm_get_eof(const H5FD_t *_file) +#else H5FD_dsm_get_eof(H5FD_t *_file) +#endif { H5FD_dsm_t *file = (H5FD_dsm_t*)_file;