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