View | Details | Raw Unified | Return to bug 252967
Collapse All | Expand All

(-)math/scilab/files/patch-hdf5 (+75 lines)
Line 0 Link Here
1
--- modules/hdf5/Makefile.am
2
+++ modules/hdf5/Makefile.am
3
@@ -103,8 +103,7 @@
4
     -DH5Gopen_vers=2 \
5
     -DH5Tget_array_dims_vers=2 \
6
     -DH5Acreate_vers=2 \
7
-    -DH5Rdereference_vers=2 \
8
-    -DNO_DEPRECATED_SYMBOLS
9
+    -DH5Rdereference_vers=2
10
 
11
 
12
 libscihdf5_la_CPPFLAGS = \
13
--- modules/hdf5/Makefile.in
14
+++ modules/hdf5/Makefile.in
15
@@ -788,8 +788,7 @@
16
     -DH5Gopen_vers=2 \
17
     -DH5Tget_array_dims_vers=2 \
18
     -DH5Acreate_vers=2 \
19
-    -DH5Rdereference_vers=2 \
20
-    -DNO_DEPRECATED_SYMBOLS
21
+    -DH5Rdereference_vers=2
22
 
23
 libscihdf5_la_CPPFLAGS = \
24
     -I$(srcdir)/includes/ \
25
--- modules/hdf5/includes/HDF5Objects.h
26
+++ modules/hdf5/includes/HDF5Objects.h
27
@@ -16,14 +16,12 @@
28
 #ifndef __HDF5OBJECTS_H__
29
 #define __HDF5OBJECTS_H__
30
 
31
-#define H5_NO_DEPRECATED_SYMBOLS
32
 #undef H5_USE_16_API
33
+#define H5_USE_18_API
34
 
35
-#define H5Eset_auto_vers 2
36
 #include <hdf5.h>
37
 #include <hdf5_hl.h>
38
 
39
-#undef H5_NO_DEPRECATED_SYMBOLS
40
 
41
 //#define __HDF5OBJECTS_DEBUG__
42
 //#define __HDF5ERROR_PRINT__
43
--- modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp
44
+++ modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp
45
@@ -13,6 +13,8 @@
46
 *
47
 */
48
 
49
+#define H5_USE_18_API
50
+
51
 #include <vector>
52
 #include "function.hxx"
53
 #include "string.hxx"
54
--- modules/hdf5/src/c/h5_readDataFromFile.c
55
+++ modules/hdf5/src/c/h5_readDataFromFile.c
56
@@ -13,7 +13,7 @@
57
 *
58
 */
59
 
60
-#define H5_NO_DEPRECATED_SYMBOLS
61
+#define H5_USE_18_API
62
 
63
 #ifndef _MSC_VER
64
 #include <sys/time.h>
65
--- modules/hdf5/src/c/h5_readDataFromFile_v1.c
66
+++ modules/hdf5/src/c/h5_readDataFromFile_v1.c
67
@@ -13,7 +13,7 @@
68
 *
69
 */
70
 
71
-#define H5_NO_DEPRECATED_SYMBOLS
72
+#define H5_USE_18_API
73
 
74
 #ifndef _MSC_VER
75
 #include <sys/time.h>

Return to bug 252967