aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/mia-fix-boost-headers.patch
blob: 158ab2afebbd791c5211351673384f4aa12cd9dc (plain)
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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
Retrieved from Debian, and added a few "#include <boost/mpl/vector.hpp>"
directives to fix the build.

diff --git a/addons/hdf5/test_hdf5_3dimage.cc b/addons/hdf5/test_hdf5_3dimage.cc
index a7185618..7a398821 100644
--- a/addons/hdf5/test_hdf5_3dimage.cc
+++ b/addons/hdf5/test_hdf5_3dimage.cc
@@ -23,7 +23,7 @@
 #include <mia/internal/autotest.hh>
 
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
+#include <boost/test/unit_test.hpp>
 
 #include <addons/hdf5/hdf5_3dimage.hh>
 
diff --git a/addons/hdf5/test_hdf5mia.cc b/addons/hdf5/test_hdf5mia.cc
index 3d62106e..8141be07 100644
--- a/addons/hdf5/test_hdf5mia.cc
+++ b/addons/hdf5/test_hdf5mia.cc
@@ -23,7 +23,6 @@
 #include <mia/internal/autotest.hh>
 
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
 #include <boost/mpl/insert_range.hpp>
 
 #include <addons/hdf5/hdf5a_mia.hh>
diff --git a/addons/nifti/test_niftiimage.cc b/addons/nifti/test_niftiimage.cc
index 8df3f0b5..840ae585 100644
--- a/addons/nifti/test_niftiimage.cc
+++ b/addons/nifti/test_niftiimage.cc
@@ -23,8 +23,6 @@
 #include <mia/internal/autotest.hh>
 
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
-
 
 #include <nifti/niftiimage.hh>
 #include <unistd.h>
diff --git a/addons/vistaio/test_2dvistaio.cc b/addons/vistaio/test_2dvistaio.cc
index b3da29a0..9b1599dd 100644
--- a/addons/vistaio/test_2dvistaio.cc
+++ b/addons/vistaio/test_2dvistaio.cc
@@ -23,8 +23,6 @@
 #include <mia/internal/autotest.hh>
 
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
-
 
 #include <vistaio/2dvistaio.hh>
 #include <unistd.h>
diff --git a/addons/vistaio/test_3dvistaio.cc b/addons/vistaio/test_3dvistaio.cc
index 93c007d0..c3ae1fdb 100644
--- a/addons/vistaio/test_3dvistaio.cc
+++ b/addons/vistaio/test_3dvistaio.cc
@@ -23,8 +23,6 @@
 #include <mia/internal/autotest.hh>
 
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
-
 
 #include <vistaio/3dvistaio.hh>
 #include <unistd.h>
diff --git a/addons/vtk/test_vtkimage.cc b/addons/vtk/test_vtkimage.cc
index eaf96a6b..8212ef1d 100644
--- a/addons/vtk/test_vtkimage.cc
+++ b/addons/vtk/test_vtkimage.cc
@@ -23,8 +23,6 @@
 #include <mia/internal/autotest.hh>
 
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
-
 
 #include <vtk/vtkimage.hh>
 #include <unistd.h>
diff --git a/mia/2d/creator/test_circle.cc b/mia/2d/creator/test_circle.cc
index 9784e05d..7ca4bab9 100644
--- a/mia/2d/creator/test_circle.cc
+++ b/mia/2d/creator/test_circle.cc
@@ -21,8 +21,6 @@
 
 #include <mia/internal/plugintester.hh>
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
-
 #include <mia/2d/creator/circle.hh>
 
 using namespace mia;
diff --git a/mia/2d/filter/test_convert.cc b/mia/2d/filter/test_convert.cc
index 80304793..f40d295a 100644
--- a/mia/2d/filter/test_convert.cc
+++ b/mia/2d/filter/test_convert.cc
@@ -25,7 +25,6 @@
 #include <type_traits>
 
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
 #include <boost/mpl/insert_range.hpp>
 
 
diff --git a/mia/2d/filter/test_morphological.cc b/mia/2d/filter/test_morphological.cc
index 2fc58583..9a004946 100644
--- a/mia/2d/filter/test_morphological.cc
+++ b/mia/2d/filter/test_morphological.cc
@@ -20,7 +20,6 @@
 
 #include <mia/internal/plugintester.hh>
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
 #include <mia/2d/filter/morphological.hh>
 
 namespace bmpl = boost::mpl;
diff --git a/mia/2d/filter/test_sortlabel.cc b/mia/2d/filter/test_sortlabel.cc
index 78464e1a..49c327e3 100644
--- a/mia/2d/filter/test_sortlabel.cc
+++ b/mia/2d/filter/test_sortlabel.cc
@@ -23,7 +23,6 @@
 #include <mia/2d/filter/sortlabel.hh>
 
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
 namespace bmpl = boost::mpl;
 
 
diff --git a/mia/2d/filter/test_thinning.cc b/mia/2d/filter/test_thinning.cc
index 3ebb2cdc..8bc5b356 100644
--- a/mia/2d/filter/test_thinning.cc
+++ b/mia/2d/filter/test_thinning.cc
@@ -21,7 +21,6 @@
 
 #include <mia/internal/plugintester.hh>
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
 #include <mia/2d/filter/thinning.hh>
 #include <mia/2d/imagetest.hh>
 
diff --git a/mia/2d/test_filter_cast.cc b/mia/2d/test_filter_cast.cc
index e806e14f..91c77398 100644
--- a/mia/2d/test_filter_cast.cc
+++ b/mia/2d/test_filter_cast.cc
@@ -24,7 +24,7 @@
 #include <mia/internal/autotest.hh>
 #include <mia/2d/filter.hh>
 
-#include <boost/test/test_case_template.hpp>
+#include <boost/mpl/vector.hpp>
 #include <boost/type_traits.hpp>
 #include <boost/mpl/list.hpp>
 
diff --git a/mia/2d/test_image.cc b/mia/2d/test_image.cc
index c82dc59b..1f602510 100644
--- a/mia/2d/test_image.cc
+++ b/mia/2d/test_image.cc
@@ -24,6 +24,7 @@
 #include <mia/internal/autotest.hh>
 
 #include <boost/filesystem/path.hpp>
+#include <boost/mpl/vector.hpp>
 
 #include <iostream>
 
diff --git a/mia/2d/test_interpol.cc b/mia/2d/test_interpol.cc
index d1f3703d..5caafccf 100644
--- a/mia/2d/test_interpol.cc
+++ b/mia/2d/test_interpol.cc
@@ -23,7 +23,6 @@
 
 #include <mia/internal/autotest.hh>
 
-#include <boost/test/test_case_template.hpp>
 #include <boost/type_traits.hpp>
 #include <boost/mpl/list.hpp>
 
diff --git a/mia/3d/fifotestfixture.cc b/mia/3d/fifotestfixture.cc
index ab2e7c65..1b6e6bb4 100644
--- a/mia/3d/fifotestfixture.cc
+++ b/mia/3d/fifotestfixture.cc
@@ -24,7 +24,7 @@
 
 #include <climits>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <mia/core/msgstream.hh>
 #include <mia/2d/imagetest.hh>
 #include <mia/3d/fifotestfixture.hh>
diff --git a/mia/3d/filter/test_convert.cc b/mia/3d/filter/test_convert.cc
index e83032c1..dad9afaa 100644
--- a/mia/3d/filter/test_convert.cc
+++ b/mia/3d/filter/test_convert.cc
@@ -20,7 +20,6 @@
 
 #include <mia/internal/autotest.hh>
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
 #include <mia/core/type_traits.hh>
 #include <mia/3d/filter/convert.hh>
 #include <boost/mpl/insert_range.hpp>
diff --git a/mia/3d/test_image.cc b/mia/3d/test_image.cc
index 18f71892..c21e0d20 100644
--- a/mia/3d/test_image.cc
+++ b/mia/3d/test_image.cc
@@ -21,7 +21,8 @@
 #include <climits>
 #include <boost/test/unit_test_suite.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
+#include <boost/mpl/vector.hpp>
 
 #include <mia/3d/image.hh>
 #include <mia/core/filter.hh>
diff --git a/mia/3d/test_imageio.cc b/mia/3d/test_imageio.cc
index 0640a668..7a6b5635 100644
--- a/mia/3d/test_imageio.cc
+++ b/mia/3d/test_imageio.cc
@@ -20,7 +20,6 @@
 
 #include <mia/internal/autotest.hh>
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
 #include <boost/mpl/insert_range.hpp>
 
 #include <mia/core/attribute_names.hh>
diff --git a/mia/core/splinekernel/test_bspline.cc b/mia/core/splinekernel/test_bspline.cc
index 54d6bda3..0abfe443 100644
--- a/mia/core/splinekernel/test_bspline.cc
+++ b/mia/core/splinekernel/test_bspline.cc
@@ -23,8 +23,6 @@
 #include <mia/core/splinekernel/bspline.hh>
 #include <mia/core/interpolator1d.hh>
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
-
 
 using namespace mia;
 using namespace mia::bsplinekernel;
diff --git a/mia/core/test_cost.cc b/mia/core/test_cost.cc
index 70097b2e..305ca84d 100644
--- a/mia/core/test_cost.cc
+++ b/mia/core/test_cost.cc
@@ -27,7 +27,7 @@
 #include <mia/core/msgstream.hh>
 
 #include <boost/test/unit_test_suite.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/test/test_tools.hpp>
 
 NS_MIA_USE
diff --git a/mia/core/test_cstplan.cc b/mia/core/test_cstplan.cc
index aa241d48..a9e5a0e3 100644
--- a/mia/core/test_cstplan.cc
+++ b/mia/core/test_cstplan.cc
@@ -23,7 +23,7 @@
 
 #include <boost/test/unit_test_suite.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <mia/core/cstplan.hh>
 
diff --git a/mia/core/test_dictmap.cc b/mia/core/test_dictmap.cc
index a9217290..fd05fe30 100644
--- a/mia/core/test_dictmap.cc
+++ b/mia/core/test_dictmap.cc
@@ -26,7 +26,7 @@
 
 #include <boost/test/test_tools.hpp>
 #include <boost/test/unit_test_suite.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <mia/core/dictmap.hh>
 #include <mia/core/cmdlineparser.hh>
diff --git a/mia/core/test_fifofilter.cc b/mia/core/test_fifofilter.cc
index 2a066f2e..6e2a385d 100644
--- a/mia/core/test_fifofilter.cc
+++ b/mia/core/test_fifofilter.cc
@@ -27,7 +27,7 @@
 
 #include <boost/test/test_tools.hpp>
 #include <boost/test/unit_test_suite.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 
 #include <mia/core/cmdlineparser.hh>
diff --git a/mia/core/test_gsl_matrix.cc b/mia/core/test_gsl_matrix.cc
index 4add5f7a..6d16353d 100644
--- a/mia/core/test_gsl_matrix.cc
+++ b/mia/core/test_gsl_matrix.cc
@@ -25,7 +25,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_ALTERNATIVE_INIT_API
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <mia/core/gsl_matrix.hh>
 
 #include <stdexcept>
diff --git a/mia/core/test_gsl_matrix_vector_ops.cc b/mia/core/test_gsl_matrix_vector_ops.cc
index e5f7d7b9..217020f7 100644
--- a/mia/core/test_gsl_matrix_vector_ops.cc
+++ b/mia/core/test_gsl_matrix_vector_ops.cc
@@ -28,7 +28,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_ALTERNATIVE_INIT_API
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <iostream>
 #include <cmath>
diff --git a/mia/core/test_gsl_multimin.cc b/mia/core/test_gsl_multimin.cc
index 5bbc434b..129f578a 100644
--- a/mia/core/test_gsl_multimin.cc
+++ b/mia/core/test_gsl_multimin.cc
@@ -25,7 +25,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_ALTERNATIVE_INIT_API
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <vector>
 
 #include <mia/core/gsl_multimin.hh>
diff --git a/mia/core/test_gsl_pca.cc b/mia/core/test_gsl_pca.cc
index 436b36b0..12942921 100644
--- a/mia/core/test_gsl_pca.cc
+++ b/mia/core/test_gsl_pca.cc
@@ -27,7 +27,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_ALTERNATIVE_INIT_API
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <mia/core/gsl_pca.hh>
 
diff --git a/mia/core/test_gsl_vector.cc b/mia/core/test_gsl_vector.cc
index 541c88b8..ba91f159 100644
--- a/mia/core/test_gsl_vector.cc
+++ b/mia/core/test_gsl_vector.cc
@@ -25,10 +25,9 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_ALTERNATIVE_INIT_API
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
 
 #include <mia/core/gsl_vector.hh>
 
diff --git a/mia/core/test_interpol.cc b/mia/core/test_interpol.cc
index 36669dc0..2dd5157d 100644
--- a/mia/core/test_interpol.cc
+++ b/mia/core/test_interpol.cc
@@ -24,7 +24,7 @@
 #include <mia/internal/autotest.hh>
 
 #include <boost/mpl/vector.hpp>
-#include <boost/test/test_case_template.hpp>
+#include <boost/test/unit_test.hpp>
 #include <boost/type_traits.hpp>
 #include <boost/filesystem/path.hpp>
 
diff --git a/mia/core/test_parameter.cc b/mia/core/test_parameter.cc
index ae9b4976..28ef2a80 100644
--- a/mia/core/test_parameter.cc
+++ b/mia/core/test_parameter.cc
@@ -26,7 +26,7 @@
 
 #include <boost/test/test_tools.hpp>
 #include <boost/test/unit_test_suite.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <mia/core/parameter.hh>
 #include <mia/core/msgstream.hh>
diff --git a/mia/core/test_probmap.cc b/mia/core/test_probmap.cc
index 2dc6cb6c..38052681 100644
--- a/mia/core/test_probmap.cc
+++ b/mia/core/test_probmap.cc
@@ -22,7 +22,7 @@
 
 #include <boost/test/unit_test_suite.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <mia/core/cmdlineparser.hh>
 #include <mia/core/probmap.hh>
diff --git a/mia/core/test_sqmin.cc b/mia/core/test_sqmin.cc
index f00b3b85..4a0b67b9 100644
--- a/mia/core/test_sqmin.cc
+++ b/mia/core/test_sqmin.cc
@@ -23,7 +23,7 @@
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test_suite.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <mia/core/sqmin.hh>
 
diff --git a/mia/internal/autotest.hh b/mia/internal/autotest.hh
index 419f6e8f..4458c0b2 100644
--- a/mia/internal/autotest.hh
+++ b/mia/internal/autotest.hh
@@ -34,7 +34,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_NO_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <miaconfig.h>
 #include <mia/core/cmdlineparser.hh>
diff --git a/mia/internal/plugintester.hh b/mia/internal/plugintester.hh
index 2d42b858..e632e5f7 100644
--- a/mia/internal/plugintester.hh
+++ b/mia/internal/plugintester.hh
@@ -31,7 +31,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_NO_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <miaconfig.h>
 #include <mia/core/factory.hh>
diff --git a/mia/test/testhelpers.hh b/mia/test/testhelpers.hh
index 27f37e7f..68c213a6 100644
--- a/mia/test/testhelpers.hh
+++ b/mia/test/testhelpers.hh
@@ -23,7 +23,7 @@
 
 #include <type_traits>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 namespace miatest
 {
diff --git a/src/2dlerp.cc b/src/2dlerp.cc
index 4c7dde77..1e8801de 100644
--- a/src/2dlerp.cc
+++ b/src/2dlerp.cc
@@ -25,7 +25,7 @@
 
 #include <boost/test/unit_test_suite.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <mia/core.hh>
 #include <mia/internal/main.hh>
diff --git a/src/3dlerp.cc b/src/3dlerp.cc
index 6ee8dca0..2f1c1f3a 100644
--- a/src/3dlerp.cc
+++ b/src/3dlerp.cc
@@ -24,7 +24,7 @@
 #define BOOST_TEST_NO_MAIN
 #include <boost/test/unit_test_suite.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <mia/core.hh>
 #include <mia/internal/main.hh>