projects/guix·blob java-team · refs

479 lines · 15.0 KiB

1Retrieved from Debian, and added a few "#include <boost/mpl/vector.hpp>"
2directives to fix the build.
3
4diff --git a/addons/hdf5/test_hdf5_3dimage.cc b/addons/hdf5/test_hdf5_3dimage.cc
5index a7185618..7a398821 100644
6--- a/addons/hdf5/test_hdf5_3dimage.cc
7+++ b/addons/hdf5/test_hdf5_3dimage.cc
8@@ -23,7 +23,7 @@
9 #include <mia/internal/autotest.hh>
10
11 #include <boost/mpl/vector.hpp>
12-#include <boost/test/test_case_template.hpp>
13+#include <boost/test/unit_test.hpp>
14
15 #include <addons/hdf5/hdf5_3dimage.hh>
16
17diff --git a/addons/hdf5/test_hdf5mia.cc b/addons/hdf5/test_hdf5mia.cc
18index 3d62106e..8141be07 100644
19--- a/addons/hdf5/test_hdf5mia.cc
20+++ b/addons/hdf5/test_hdf5mia.cc
21@@ -23,7 +23,6 @@
22 #include <mia/internal/autotest.hh>
23
24 #include <boost/mpl/vector.hpp>
25-#include <boost/test/test_case_template.hpp>
26 #include <boost/mpl/insert_range.hpp>
27
28 #include <addons/hdf5/hdf5a_mia.hh>
29diff --git a/addons/nifti/test_niftiimage.cc b/addons/nifti/test_niftiimage.cc
30index 8df3f0b5..840ae585 100644
31--- a/addons/nifti/test_niftiimage.cc
32+++ b/addons/nifti/test_niftiimage.cc
33@@ -23,8 +23,6 @@
34 #include <mia/internal/autotest.hh>
35
36 #include <boost/mpl/vector.hpp>
37-#include <boost/test/test_case_template.hpp>
38-
39
40 #include <nifti/niftiimage.hh>
41 #include <unistd.h>
42diff --git a/addons/vistaio/test_2dvistaio.cc b/addons/vistaio/test_2dvistaio.cc
43index b3da29a0..9b1599dd 100644
44--- a/addons/vistaio/test_2dvistaio.cc
45+++ b/addons/vistaio/test_2dvistaio.cc
46@@ -23,8 +23,6 @@
47 #include <mia/internal/autotest.hh>
48
49 #include <boost/mpl/vector.hpp>
50-#include <boost/test/test_case_template.hpp>
51-
52
53 #include <vistaio/2dvistaio.hh>
54 #include <unistd.h>
55diff --git a/addons/vistaio/test_3dvistaio.cc b/addons/vistaio/test_3dvistaio.cc
56index 93c007d0..c3ae1fdb 100644
57--- a/addons/vistaio/test_3dvistaio.cc
58+++ b/addons/vistaio/test_3dvistaio.cc
59@@ -23,8 +23,6 @@
60 #include <mia/internal/autotest.hh>
61
62 #include <boost/mpl/vector.hpp>
63-#include <boost/test/test_case_template.hpp>
64-
65
66 #include <vistaio/3dvistaio.hh>
67 #include <unistd.h>
68diff --git a/addons/vtk/test_vtkimage.cc b/addons/vtk/test_vtkimage.cc
69index eaf96a6b..8212ef1d 100644
70--- a/addons/vtk/test_vtkimage.cc
71+++ b/addons/vtk/test_vtkimage.cc
72@@ -23,8 +23,6 @@
73 #include <mia/internal/autotest.hh>
74
75 #include <boost/mpl/vector.hpp>
76-#include <boost/test/test_case_template.hpp>
77-
78
79 #include <vtk/vtkimage.hh>
80 #include <unistd.h>
81diff --git a/mia/2d/creator/test_circle.cc b/mia/2d/creator/test_circle.cc
82index 9784e05d..7ca4bab9 100644
83--- a/mia/2d/creator/test_circle.cc
84+++ b/mia/2d/creator/test_circle.cc
85@@ -21,8 +21,6 @@
86
87 #include <mia/internal/plugintester.hh>
88 #include <boost/mpl/vector.hpp>
89-#include <boost/test/test_case_template.hpp>
90-
91 #include <mia/2d/creator/circle.hh>
92
93 using namespace mia;
94diff --git a/mia/2d/filter/test_convert.cc b/mia/2d/filter/test_convert.cc
95index 80304793..f40d295a 100644
96--- a/mia/2d/filter/test_convert.cc
97+++ b/mia/2d/filter/test_convert.cc
98@@ -25,7 +25,6 @@
99 #include <type_traits>
100
101 #include <boost/mpl/vector.hpp>
102-#include <boost/test/test_case_template.hpp>
103 #include <boost/mpl/insert_range.hpp>
104
105
106diff --git a/mia/2d/filter/test_morphological.cc b/mia/2d/filter/test_morphological.cc
107index 2fc58583..9a004946 100644
108--- a/mia/2d/filter/test_morphological.cc
109+++ b/mia/2d/filter/test_morphological.cc
110@@ -20,7 +20,6 @@
111
112 #include <mia/internal/plugintester.hh>
113 #include <boost/mpl/vector.hpp>
114-#include <boost/test/test_case_template.hpp>
115 #include <mia/2d/filter/morphological.hh>
116
117 namespace bmpl = boost::mpl;
118diff --git a/mia/2d/filter/test_sortlabel.cc b/mia/2d/filter/test_sortlabel.cc
119index 78464e1a..49c327e3 100644
120--- a/mia/2d/filter/test_sortlabel.cc
121+++ b/mia/2d/filter/test_sortlabel.cc
122@@ -23,7 +23,6 @@
123 #include <mia/2d/filter/sortlabel.hh>
124
125 #include <boost/mpl/vector.hpp>
126-#include <boost/test/test_case_template.hpp>
127 namespace bmpl = boost::mpl;
128
129
130diff --git a/mia/2d/filter/test_thinning.cc b/mia/2d/filter/test_thinning.cc
131index 3ebb2cdc..8bc5b356 100644
132--- a/mia/2d/filter/test_thinning.cc
133+++ b/mia/2d/filter/test_thinning.cc
134@@ -21,7 +21,6 @@
135
136 #include <mia/internal/plugintester.hh>
137 #include <boost/mpl/vector.hpp>
138-#include <boost/test/test_case_template.hpp>
139 #include <mia/2d/filter/thinning.hh>
140 #include <mia/2d/imagetest.hh>
141
142diff --git a/mia/2d/test_filter_cast.cc b/mia/2d/test_filter_cast.cc
143index e806e14f..91c77398 100644
144--- a/mia/2d/test_filter_cast.cc
145+++ b/mia/2d/test_filter_cast.cc
146@@ -24,7 +24,7 @@
147 #include <mia/internal/autotest.hh>
148 #include <mia/2d/filter.hh>
149
150-#include <boost/test/test_case_template.hpp>
151+#include <boost/mpl/vector.hpp>
152 #include <boost/type_traits.hpp>
153 #include <boost/mpl/list.hpp>
154
155diff --git a/mia/2d/test_image.cc b/mia/2d/test_image.cc
156index c82dc59b..1f602510 100644
157--- a/mia/2d/test_image.cc
158+++ b/mia/2d/test_image.cc
159@@ -24,6 +24,7 @@
160 #include <mia/internal/autotest.hh>
161
162 #include <boost/filesystem/path.hpp>
163+#include <boost/mpl/vector.hpp>
164
165 #include <iostream>
166
167diff --git a/mia/2d/test_interpol.cc b/mia/2d/test_interpol.cc
168index d1f3703d..5caafccf 100644
169--- a/mia/2d/test_interpol.cc
170+++ b/mia/2d/test_interpol.cc
171@@ -23,7 +23,6 @@
172
173 #include <mia/internal/autotest.hh>
174
175-#include <boost/test/test_case_template.hpp>
176 #include <boost/type_traits.hpp>
177 #include <boost/mpl/list.hpp>
178
179diff --git a/mia/3d/fifotestfixture.cc b/mia/3d/fifotestfixture.cc
180index ab2e7c65..1b6e6bb4 100644
181--- a/mia/3d/fifotestfixture.cc
182+++ b/mia/3d/fifotestfixture.cc
183@@ -24,7 +24,7 @@
184
185 #include <climits>
186 #include <boost/test/unit_test.hpp>
187-#include <boost/test/floating_point_comparison.hpp>
188+#include <boost/test/tools/floating_point_comparison.hpp>
189 #include <mia/core/msgstream.hh>
190 #include <mia/2d/imagetest.hh>
191 #include <mia/3d/fifotestfixture.hh>
192diff --git a/mia/3d/filter/test_convert.cc b/mia/3d/filter/test_convert.cc
193index e83032c1..dad9afaa 100644
194--- a/mia/3d/filter/test_convert.cc
195+++ b/mia/3d/filter/test_convert.cc
196@@ -20,7 +20,6 @@
197
198 #include <mia/internal/autotest.hh>
199 #include <boost/mpl/vector.hpp>
200-#include <boost/test/test_case_template.hpp>
201 #include <mia/core/type_traits.hh>
202 #include <mia/3d/filter/convert.hh>
203 #include <boost/mpl/insert_range.hpp>
204diff --git a/mia/3d/test_image.cc b/mia/3d/test_image.cc
205index 18f71892..c21e0d20 100644
206--- a/mia/3d/test_image.cc
207+++ b/mia/3d/test_image.cc
208@@ -21,7 +21,8 @@
209 #include <climits>
210 #include <boost/test/unit_test_suite.hpp>
211 #include <boost/test/unit_test.hpp>
212-#include <boost/test/floating_point_comparison.hpp>
213+#include <boost/test/tools/floating_point_comparison.hpp>
214+#include <boost/mpl/vector.hpp>
215
216 #include <mia/3d/image.hh>
217 #include <mia/core/filter.hh>
218diff --git a/mia/3d/test_imageio.cc b/mia/3d/test_imageio.cc
219index 0640a668..7a6b5635 100644
220--- a/mia/3d/test_imageio.cc
221+++ b/mia/3d/test_imageio.cc
222@@ -20,7 +20,6 @@
223
224 #include <mia/internal/autotest.hh>
225 #include <boost/mpl/vector.hpp>
226-#include <boost/test/test_case_template.hpp>
227 #include <boost/mpl/insert_range.hpp>
228
229 #include <mia/core/attribute_names.hh>
230diff --git a/mia/core/splinekernel/test_bspline.cc b/mia/core/splinekernel/test_bspline.cc
231index 54d6bda3..0abfe443 100644
232--- a/mia/core/splinekernel/test_bspline.cc
233+++ b/mia/core/splinekernel/test_bspline.cc
234@@ -23,8 +23,6 @@
235 #include <mia/core/splinekernel/bspline.hh>
236 #include <mia/core/interpolator1d.hh>
237 #include <boost/mpl/vector.hpp>
238-#include <boost/test/test_case_template.hpp>
239-
240
241 using namespace mia;
242 using namespace mia::bsplinekernel;
243diff --git a/mia/core/test_cost.cc b/mia/core/test_cost.cc
244index 70097b2e..305ca84d 100644
245--- a/mia/core/test_cost.cc
246+++ b/mia/core/test_cost.cc
247@@ -27,7 +27,7 @@
248 #include <mia/core/msgstream.hh>
249
250 #include <boost/test/unit_test_suite.hpp>
251-#include <boost/test/floating_point_comparison.hpp>
252+#include <boost/test/tools/floating_point_comparison.hpp>
253 #include <boost/test/test_tools.hpp>
254
255 NS_MIA_USE
256diff --git a/mia/core/test_cstplan.cc b/mia/core/test_cstplan.cc
257index aa241d48..a9e5a0e3 100644
258--- a/mia/core/test_cstplan.cc
259+++ b/mia/core/test_cstplan.cc
260@@ -23,7 +23,7 @@
261
262 #include <boost/test/unit_test_suite.hpp>
263 #include <boost/test/unit_test.hpp>
264-#include <boost/test/floating_point_comparison.hpp>
265+#include <boost/test/tools/floating_point_comparison.hpp>
266
267 #include <mia/core/cstplan.hh>
268
269diff --git a/mia/core/test_dictmap.cc b/mia/core/test_dictmap.cc
270index a9217290..fd05fe30 100644
271--- a/mia/core/test_dictmap.cc
272+++ b/mia/core/test_dictmap.cc
273@@ -26,7 +26,7 @@
274
275 #include <boost/test/test_tools.hpp>
276 #include <boost/test/unit_test_suite.hpp>
277-#include <boost/test/floating_point_comparison.hpp>
278+#include <boost/test/tools/floating_point_comparison.hpp>
279
280 #include <mia/core/dictmap.hh>
281 #include <mia/core/cmdlineparser.hh>
282diff --git a/mia/core/test_fifofilter.cc b/mia/core/test_fifofilter.cc
283index 2a066f2e..6e2a385d 100644
284--- a/mia/core/test_fifofilter.cc
285+++ b/mia/core/test_fifofilter.cc
286@@ -27,7 +27,7 @@
287
288 #include <boost/test/test_tools.hpp>
289 #include <boost/test/unit_test_suite.hpp>
290-#include <boost/test/floating_point_comparison.hpp>
291+#include <boost/test/tools/floating_point_comparison.hpp>
292
293
294 #include <mia/core/cmdlineparser.hh>
295diff --git a/mia/core/test_gsl_matrix.cc b/mia/core/test_gsl_matrix.cc
296index 4add5f7a..6d16353d 100644
297--- a/mia/core/test_gsl_matrix.cc
298+++ b/mia/core/test_gsl_matrix.cc
299@@ -25,7 +25,7 @@
300 #define BOOST_TEST_MAIN
301 #define BOOST_TEST_ALTERNATIVE_INIT_API
302 #include <boost/test/unit_test.hpp>
303-#include <boost/test/floating_point_comparison.hpp>
304+#include <boost/test/tools/floating_point_comparison.hpp>
305 #include <mia/core/gsl_matrix.hh>
306
307 #include <stdexcept>
308diff --git a/mia/core/test_gsl_matrix_vector_ops.cc b/mia/core/test_gsl_matrix_vector_ops.cc
309index e5f7d7b9..217020f7 100644
310--- a/mia/core/test_gsl_matrix_vector_ops.cc
311+++ b/mia/core/test_gsl_matrix_vector_ops.cc
312@@ -28,7 +28,7 @@
313 #define BOOST_TEST_MAIN
314 #define BOOST_TEST_ALTERNATIVE_INIT_API
315 #include <boost/test/unit_test.hpp>
316-#include <boost/test/floating_point_comparison.hpp>
317+#include <boost/test/tools/floating_point_comparison.hpp>
318
319 #include <iostream>
320 #include <cmath>
321diff --git a/mia/core/test_gsl_multimin.cc b/mia/core/test_gsl_multimin.cc
322index 5bbc434b..129f578a 100644
323--- a/mia/core/test_gsl_multimin.cc
324+++ b/mia/core/test_gsl_multimin.cc
325@@ -25,7 +25,7 @@
326 #define BOOST_TEST_MAIN
327 #define BOOST_TEST_ALTERNATIVE_INIT_API
328 #include <boost/test/unit_test.hpp>
329-#include <boost/test/floating_point_comparison.hpp>
330+#include <boost/test/tools/floating_point_comparison.hpp>
331 #include <vector>
332
333 #include <mia/core/gsl_multimin.hh>
334diff --git a/mia/core/test_gsl_pca.cc b/mia/core/test_gsl_pca.cc
335index 436b36b0..12942921 100644
336--- a/mia/core/test_gsl_pca.cc
337+++ b/mia/core/test_gsl_pca.cc
338@@ -27,7 +27,7 @@
339 #define BOOST_TEST_MAIN
340 #define BOOST_TEST_ALTERNATIVE_INIT_API
341 #include <boost/test/unit_test.hpp>
342-#include <boost/test/floating_point_comparison.hpp>
343+#include <boost/test/tools/floating_point_comparison.hpp>
344
345 #include <mia/core/gsl_pca.hh>
346
347diff --git a/mia/core/test_gsl_vector.cc b/mia/core/test_gsl_vector.cc
348index 541c88b8..ba91f159 100644
349--- a/mia/core/test_gsl_vector.cc
350+++ b/mia/core/test_gsl_vector.cc
351@@ -25,10 +25,9 @@
352 #define BOOST_TEST_MAIN
353 #define BOOST_TEST_ALTERNATIVE_INIT_API
354 #include <boost/test/unit_test.hpp>
355-#include <boost/test/floating_point_comparison.hpp>
356+#include <boost/test/tools/floating_point_comparison.hpp>
357
358 #include <boost/mpl/vector.hpp>
359-#include <boost/test/test_case_template.hpp>
360
361 #include <mia/core/gsl_vector.hh>
362
363diff --git a/mia/core/test_interpol.cc b/mia/core/test_interpol.cc
364index 36669dc0..2dd5157d 100644
365--- a/mia/core/test_interpol.cc
366+++ b/mia/core/test_interpol.cc
367@@ -24,7 +24,7 @@
368 #include <mia/internal/autotest.hh>
369
370 #include <boost/mpl/vector.hpp>
371-#include <boost/test/test_case_template.hpp>
372+#include <boost/test/unit_test.hpp>
373 #include <boost/type_traits.hpp>
374 #include <boost/filesystem/path.hpp>
375
376diff --git a/mia/core/test_parameter.cc b/mia/core/test_parameter.cc
377index ae9b4976..28ef2a80 100644
378--- a/mia/core/test_parameter.cc
379+++ b/mia/core/test_parameter.cc
380@@ -26,7 +26,7 @@
381
382 #include <boost/test/test_tools.hpp>
383 #include <boost/test/unit_test_suite.hpp>
384-#include <boost/test/floating_point_comparison.hpp>
385+#include <boost/test/tools/floating_point_comparison.hpp>
386
387 #include <mia/core/parameter.hh>
388 #include <mia/core/msgstream.hh>
389diff --git a/mia/core/test_probmap.cc b/mia/core/test_probmap.cc
390index 2dc6cb6c..38052681 100644
391--- a/mia/core/test_probmap.cc
392+++ b/mia/core/test_probmap.cc
393@@ -22,7 +22,7 @@
394
395 #include <boost/test/unit_test_suite.hpp>
396 #include <boost/test/unit_test.hpp>
397-#include <boost/test/floating_point_comparison.hpp>
398+#include <boost/test/tools/floating_point_comparison.hpp>
399
400 #include <mia/core/cmdlineparser.hh>
401 #include <mia/core/probmap.hh>
402diff --git a/mia/core/test_sqmin.cc b/mia/core/test_sqmin.cc
403index f00b3b85..4a0b67b9 100644
404--- a/mia/core/test_sqmin.cc
405+++ b/mia/core/test_sqmin.cc
406@@ -23,7 +23,7 @@
407 #define BOOST_TEST_DYN_LINK
408 #include <boost/test/unit_test_suite.hpp>
409 #include <boost/test/unit_test.hpp>
410-#include <boost/test/floating_point_comparison.hpp>
411+#include <boost/test/tools/floating_point_comparison.hpp>
412
413 #include <mia/core/sqmin.hh>
414
415diff --git a/mia/internal/autotest.hh b/mia/internal/autotest.hh
416index 419f6e8f..4458c0b2 100644
417--- a/mia/internal/autotest.hh
418+++ b/mia/internal/autotest.hh
419@@ -34,7 +34,7 @@
420 #define BOOST_TEST_MAIN
421 #define BOOST_TEST_NO_MAIN
422 #include <boost/test/unit_test.hpp>
423-#include <boost/test/floating_point_comparison.hpp>
424+#include <boost/test/tools/floating_point_comparison.hpp>
425
426 #include <miaconfig.h>
427 #include <mia/core/cmdlineparser.hh>
428diff --git a/mia/internal/plugintester.hh b/mia/internal/plugintester.hh
429index 2d42b858..e632e5f7 100644
430--- a/mia/internal/plugintester.hh
431+++ b/mia/internal/plugintester.hh
432@@ -31,7 +31,7 @@
433 #define BOOST_TEST_MAIN
434 #define BOOST_TEST_NO_MAIN
435 #include <boost/test/unit_test.hpp>
436-#include <boost/test/floating_point_comparison.hpp>
437+#include <boost/test/tools/floating_point_comparison.hpp>
438
439 #include <miaconfig.h>
440 #include <mia/core/factory.hh>
441diff --git a/mia/test/testhelpers.hh b/mia/test/testhelpers.hh
442index 27f37e7f..68c213a6 100644
443--- a/mia/test/testhelpers.hh
444+++ b/mia/test/testhelpers.hh
445@@ -23,7 +23,7 @@
446
447 #include <type_traits>
448 #include <boost/test/unit_test.hpp>
449-#include <boost/test/floating_point_comparison.hpp>
450+#include <boost/test/tools/floating_point_comparison.hpp>
451
452 namespace miatest
453 {
454diff --git a/src/2dlerp.cc b/src/2dlerp.cc
455index 4c7dde77..1e8801de 100644
456--- a/src/2dlerp.cc
457+++ b/src/2dlerp.cc
458@@ -25,7 +25,7 @@
459
460 #include <boost/test/unit_test_suite.hpp>
461 #include <boost/test/unit_test.hpp>
462-#include <boost/test/floating_point_comparison.hpp>
463+#include <boost/test/tools/floating_point_comparison.hpp>
464
465 #include <mia/core.hh>
466 #include <mia/internal/main.hh>
467diff --git a/src/3dlerp.cc b/src/3dlerp.cc
468index 6ee8dca0..2f1c1f3a 100644
469--- a/src/3dlerp.cc
470+++ b/src/3dlerp.cc
471@@ -24,7 +24,7 @@
472 #define BOOST_TEST_NO_MAIN
473 #include <boost/test/unit_test_suite.hpp>
474 #include <boost/test/unit_test.hpp>
475-#include <boost/test/floating_point_comparison.hpp>
476+#include <boost/test/tools/floating_point_comparison.hpp>
477
478 #include <mia/core.hh>
479 #include <mia/internal/main.hh>