2006-07-05 Roland Levillain <roland@lrde.epita.fr> Fix sanity tests. * oln/io/se_fwd.hh: New file. * oln/io/base.hh: Include it, and move the inclusions of oln/io/se_window.hh and oln/io/se_neighborhood.hh at the end of the file to prevent cycles in header inclusions from leading to ill-formed calls to template functions. * oln/makefile.src (OLN_DEP): Add io/se_fwd.hh. Index: 10.235/oln.prj --- 10.235/oln.prj +++ 10.235(w)/oln.prj @@ -1496,6 +1496,11 @@ ;; to version 10.232(w), by levill_r: (olena/oln/convert/float_cmp.hh (oln/w/40_float_cmp. 1.1 644)) + +;; Files added by populate at Wed, 05 Jul 2006 18:20:54 +0200, +;; to version 10.235(w), by levill_r: + + (olena/oln/io/se_fwd.hh ()) ) (Merge-Parents) (New-Merge-Parents) Index: 10.235/olena/oln/io/base.hh --- 10.235/olena/oln/io/base.hh Fri, 19 Mar 2004 18:50:43 +0100 odou_s (oln/b/20_base.hh 1.10 600) +++ 10.235(w)/olena/oln/io/base.hh Wed, 05 Jul 2006 16:46:11 +0200 levill_r (oln/b/20_base.hh 1.10 600) @@ -30,9 +30,8 @@ # include <oln/io/image_read.hh> # include <oln/io/image_write.hh> - -# include <oln/io/se_window.hh> -# include <oln/io/se_neighborhood.hh> +/// Forward declarations. +# include <oln/io/se_fwd.hh> namespace oln { @@ -134,4 +133,8 @@ } // end of namespace oln +// Implementations. +# include <oln/io/se_window.hh> +# include <oln/io/se_neighborhood.hh> + #endif // OLENA_IO_BASE_HH Index: 10.235/olena/oln/makefile.src --- 10.235/olena/oln/makefile.src Wed, 05 Jul 2006 18:12:32 +0200 levill_r (oln/r/4_makefile.s 1.8 600) +++ 10.235(w)/olena/oln/makefile.src Wed, 05 Jul 2006 18:20:32 +0200 levill_r (oln/r/4_makefile.s 1.8 600) @@ -138,6 +138,7 @@ io/pnm_write_data.hh \ io/readable.hh \ io/se.hh \ + io/se_fwd.hh \ io/se_neighborhood.hh \ io/se_window.hh \ io/stream_wrapper.hh \ Only in 10.235(w): olena/oln/io/se_fwd.hh