1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
diff -Naur ParaView3/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx
--- ParaView3/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2009-06-17 17:00:28.000000000 -0400
+++ ParaView3.new/Utilities/Xdmf2/libsrc/XdmfH5Driver.cxx 2010-01-16 10:09:22.000000000 -0500
@@ -132,9 +132,15 @@
static herr_t H5FD_dsm_flush(H5FD_t *_file);
#endif
static int H5FD_dsm_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+#ifdef H5_USE_16_API
+static haddr_t H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t);
+static herr_t H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t, 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,
@@ -159,6 +165,7 @@
H5FD_dsm_close, /*close */
H5FD_dsm_cmp, /*cmp */
NULL, /*query */
+ NULL, /*type map */
NULL, /*alloc */
NULL, /*free */
H5FD_dsm_get_eoa, /*get_eoa */
@@ -168,6 +175,7 @@
H5FD_dsm_read, /*read */
H5FD_dsm_write, /*write */
NULL, /*flush */
+ NULL, /*truncate */
NULL, /*lock */
NULL, /*unlock */
H5FD_FLMAP_SINGLE /*fl_map */
@@ -594,7 +602,11 @@
*-------------------------------------------------------------------------
*/
static haddr_t
+#ifdef H5_USE_16_API
+H5FD_dsm_get_eoa(const H5FD_t *_file, H5FD_mem_t)
+#else
H5FD_dsm_get_eoa(H5FD_t *_file)
+#endif
{
H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
@@ -622,7 +634,11 @@
*-------------------------------------------------------------------------
*/
static herr_t
+#ifdef H5_USE_16_API
+H5FD_dsm_set_eoa(H5FD_t *_file, H5FD_mem_t, haddr_t addr)
+#else
H5FD_dsm_set_eoa(H5FD_t *_file, haddr_t addr)
+#endif
{
H5FD_dsm_t *file = (H5FD_dsm_t*)_file;
@@ -663,7 +679,11 @@
*-------------------------------------------------------------------------
*/
static haddr_t
+#ifdef H5_USE_16_API
+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;
|