[Olena-patches] 2803: Make all_headers and essential_headers compile.

* mln/core/image/all.hh, * mln/debug/all.hh, * mln/io/all.hh, * mln/io/fits/all.hh, * mln/make/all.hh, * mln/util/all.hh: comment headers causing compilation errors. * tests/all_headers.cc: fix copyright. * tests/essential_headers.cc, * tests/Makefile.am: add essential_headers test. --- milena/ChangeLog | 16 +++++++++++ milena/mln/core/image/all.hh | 28 ++++++++++---------- milena/mln/debug/all.hh | 2 +- milena/mln/io/all.hh | 4 +- milena/mln/io/fits/all.hh | 2 +- milena/mln/make/all.hh | 3 +- milena/mln/util/all.hh | 4 +- milena/tests/Makefile.am | 4 ++- milena/tests/all_headers.cc | 2 +- .../io/fits/all.hh => tests/essential_headers.cc} | 24 +++++------------ 10 files changed, 48 insertions(+), 41 deletions(-) copy milena/{mln/io/fits/all.hh => tests/essential_headers.cc} (77%) diff --git a/milena/ChangeLog b/milena/ChangeLog index f69b232..7d6da48 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2008-11-04 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Make all_headers and essential_headers compile. + + * mln/core/image/all.hh, + * mln/debug/all.hh, + * mln/io/all.hh, + * mln/io/fits/all.hh, + * mln/make/all.hh, + * mln/util/all.hh: comment headers causing compilation errors. + + * tests/all_headers.cc: fix copyright. + + * tests/essential_headers.cc, + * tests/Makefile.am: add essential_headers test. + +2008-11-04 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Various small fixes. * milena/mln/accu/line.hh: avoid compilation warnings. diff --git a/milena/mln/core/image/all.hh b/milena/mln/core/image/all.hh index 2f2d819..ded49a3 100644 --- a/milena/mln/core/image/all.hh +++ b/milena/mln/core/image/all.hh @@ -48,7 +48,7 @@ # include <mln/core/image/flat_image.hh> # include <mln/core/image/image_if.hh> # include <mln/core/image/sub_image.hh> -# include <mln/core/image/fi_adaptor.hh> +//# include <mln/core/image/fi_adaptor.hh> # include <mln/core/image/image1d.hh> # include <mln/core/image/decorated_image.hh> # include <mln/core/image/extended.hh> @@ -61,11 +61,11 @@ //# include <mln/core/image/graph_image.hh> # include <mln/core/image/graph_neighborhood_piter.hh> # include <mln/core/image/graph_window_piter.hh> -# include <mln/core/image/hexa.hh> -# include <mln/core/image/hexa_piter.hh> +//# include <mln/core/image/hexa.hh> +//# include <mln/core/image/hexa_piter.hh> # include <mln/core/image/image1d.hh> # include <mln/core/image/image2d.hh> -# include <mln/core/image/image2d_h.hh> +//# include <mln/core/image/image2d_h.hh> # include <mln/core/image/image3d.hh> # include <mln/core/image/image_if.hh> # include <mln/core/image/interpolated.hh> @@ -76,15 +76,15 @@ //# include <mln/core/image/line_graph_neighborhood_piter.hh> //# include <mln/core/image/line_graph_psite.hh> //# include <mln/core/image/line_graph_window_piter.hh> -# include <mln/core/image/mono_obased_rle_encode.hh> -# include <mln/core/image/mono_obased_rle_image.hh> -# include <mln/core/image/mono_rle_encode.hh> -# include <mln/core/image/mono_rle_image.hh> -# include <mln/core/image/obased_rle_encode.hh> -# include <mln/core/image/obased_rle_image.hh> +//# include <mln/core/image/mono_obased_rle_encode.hh> +//# include <mln/core/image/mono_obased_rle_image.hh> +//# include <mln/core/image/mono_rle_encode.hh> +//# include <mln/core/image/mono_rle_image.hh> +//# include <mln/core/image/obased_rle_encode.hh> +//# include <mln/core/image/obased_rle_image.hh> # include <mln/core/image/plain.hh> -# include <mln/core/image/rle_encode.hh> -# include <mln/core/image/rle_image.hh> +//# include <mln/core/image/rle_encode.hh> +//# include <mln/core/image/rle_image.hh> # include <mln/core/image/safe.hh> # include <mln/core/image/sparse_encode.hh> # include <mln/core/image/sparse_image.hh> @@ -94,8 +94,8 @@ # include <mln/core/image/translate_image.hh> # include <mln/core/image/tr_image.hh> # include <mln/core/image/tr_mesh.hh> -# include <mln/core/image/value_enc_image.hh> -# include <mln/core/image/value_encode.hh> +//# include <mln/core/image/value_enc_image.hh> +//# include <mln/core/image/value_encode.hh> #endif // ! MLN_CORE_IMAGE_ALL_HH diff --git a/milena/mln/debug/all.hh b/milena/mln/debug/all.hh index e2db2f4..a17fb37 100644 --- a/milena/mln/debug/all.hh +++ b/milena/mln/debug/all.hh @@ -48,7 +48,7 @@ namespace mln # include <mln/debug/colorize.hh> # include <mln/debug/format.hh> -# include <mln/debug/graph.hh> +//# include <mln/debug/graph.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> # include <mln/debug/println_with_border.hh> diff --git a/milena/mln/io/all.hh b/milena/mln/io/all.hh index 51ddbb2..bb6f7d3 100644 --- a/milena/mln/io/all.hh +++ b/milena/mln/io/all.hh @@ -46,8 +46,8 @@ namespace mln } -# include <mln/io/fits/all.hh> -# include <mln/io/off/all.hh> +//# include <mln/io/fits/all.hh> +//# include <mln/io/off/all.hh> # include <mln/io/pbm/all.hh> # include <mln/io/pfm/all.hh> # include <mln/io/pgm/all.hh> diff --git a/milena/mln/io/fits/all.hh b/milena/mln/io/fits/all.hh index 44821f3..42c3739 100644 --- a/milena/mln/io/fits/all.hh +++ b/milena/mln/io/fits/all.hh @@ -45,6 +45,6 @@ namespace mln } -# include <mln/io/fits/load.hh> +//# include <mln/io/fits/load.hh> #endif // ! MLN_IO_FITS_ALL_HH diff --git a/milena/mln/make/all.hh b/milena/mln/make/all.hh index a36d8c3..5d11136 100644 --- a/milena/mln/make/all.hh +++ b/milena/mln/make/all.hh @@ -55,7 +55,7 @@ namespace mln # include <mln/make/pixel.hh> # include <mln/make/point2d_h.hh> # include <mln/make/vec.hh> -# include <mln/make/voronoi.hh> +//# include <mln/make/voronoi.hh> # include <mln/make/w_window.hh> # include <mln/make/w_window1d.hh> # include <mln/make/w_window1d_int.hh> @@ -66,5 +66,4 @@ namespace mln # include <mln/make/w_window_directional.hh> # include <mln/make/win_chamfer.hh> - #endif // ! MLN_MAKE_ALL_HH diff --git a/milena/mln/util/all.hh b/milena/mln/util/all.hh index 7e6b5ef..169284f 100644 --- a/milena/mln/util/all.hh +++ b/milena/mln/util/all.hh @@ -66,13 +66,13 @@ namespace mln # include <mln/util/pix.hh> # include <mln/util/set.hh> # include <mln/util/site_pair.hh> -# include <mln/util/timer.hh> +//# include <mln/util/timer.hh> # include <mln/util/tracked_ptr.hh> # include <mln/util/tree.hh> # include <mln/util/tree_fast.hh> # include <mln/util/tree_fast_to_image.hh> # include <mln/util/tree_to_fast.hh> -# include <mln/util/tree_to_image.hh> +//# include <mln/util/tree_to_image.hh> # include <mln/util/yes.hh> #endif // ! MLN_UTIL_ALL_HH diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 665344e..bec1d60 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -44,8 +44,10 @@ SUBDIRS = \ win check_PROGRAMS = \ - all_headers + all_headers \ + essential_headers all_headers_SOURCES = all_headers.cc +essential_headers_SOURCES = essential_headers.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/all_headers.cc b/milena/tests/all_headers.cc index 611f282..b84a0b8 100644 --- a/milena/tests/all_headers.cc +++ b/milena/tests/all_headers.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms diff --git a/milena/mln/io/fits/all.hh b/milena/tests/essential_headers.cc similarity index 77% copy from milena/mln/io/fits/all.hh copy to milena/tests/essential_headers.cc index 44821f3..fab5533 100644 --- a/milena/mln/io/fits/all.hh +++ b/milena/tests/essential_headers.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,26 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_IO_FITS_ALL_HH -# define MLN_IO_FITS_ALL_HH - -/*! \file mln/io/fits/all.hh +/*! \file tests/essential_headers.cc * - * \brief File that includes all fits io materials. + * \brief Tests with essential headers. (check norris tests 2) */ +#include <mln/essential/1d.hh> +#include <mln/essential/2d.hh> +#include <mln/essential/3d.hh> -namespace mln +int main () { - namespace io - { - /// Namespace of fits input/output handling. - namespace fits {} - } - } - -# include <mln/io/fits/load.hh> - -#endif // ! MLN_IO_FITS_ALL_HH -- 1.5.6.5