[Olena-patches] 3086: Fix compilation issues.

* tests/unit_test/Makefile.am, * headers.mk: remove entries related to non-commited files. * mln/convert/impl/from_image_to_site_set.hh, * mln/convert/from_to.hh: Use forward declarations. * mln/core/routine/init.hh: fix wrong include. * mln/core/site_set/operators.hh: add a missing forward declaration. --- milena/ChangeLog | 14 ++++++++++++++ milena/headers.mk | 5 ----- milena/mln/convert/from_to.hh | 19 +++++++++++-------- milena/mln/convert/impl/from_image_to_site_set.hh | 7 +++++-- milena/mln/core/routine/init.hh | 2 +- milena/mln/core/site_set/operators.hh | 9 +++++---- milena/tests/unit_test/Makefile.am | 6 ------ 7 files changed, 36 insertions(+), 26 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c713b83..e1a51ee 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2008-12-29 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Fix compilation issues. + + * tests/unit_test/Makefile.am, + * headers.mk: remove entries related to non-commited files. + + * mln/convert/impl/from_image_to_site_set.hh, + * mln/convert/from_to.hh: Use forward declarations. + + * mln/core/routine/init.hh: fix wrong include. + + * mln/core/site_set/operators.hh: add a missing forward declaration. + +2008-12-29 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Propagate renaming level::fill/paste as data::fill/paste (again). * doc/examples/erosion.cc, diff --git a/milena/headers.mk b/milena/headers.mk index 24043ff..7111d16 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -777,7 +777,6 @@ mln/core/category.hh \ mln/core/macros.hh \ mln/core/box_runstart_piter.hh \ mln/core/tags.hh \ -mln/core/w_window.hh.orig \ mln/core/dpoint.hh \ mln/core/alias/dpoint2d_h.hh \ mln/core/alias/p_run2d.hh \ @@ -841,14 +840,12 @@ mln/core/concept/weighted_window.hh \ mln/core/concept/all.hh \ mln/core/concept/gpoint.hh \ mln/core/concept/site_iterator.hh \ -mln/core/concept/window.hh.LOCAL.2903.hh \ mln/core/concept/point.hh \ mln/core/concept/literal.hh \ mln/core/concept/pixel_iterator.hh \ mln/core/concept/README \ mln/core/concept/value_iterator.hh \ mln/core/concept/meta_accumulator.hh \ -mln/core/concept/window.hh.BASE.2903.hh \ mln/core/concept/gdpoint.hh \ mln/core/concept/regular_grid.hh \ mln/core/concept/mesh.hh \ @@ -864,8 +861,6 @@ mln/core/concept/meta_fun.hh \ mln/core/concept/delta_point_site.hh \ mln/core/concept/status.txt \ mln/core/concept/neighborhood.hh \ -mln/core/concept/window.hh.orig \ -mln/core/concept/window.hh.REMOTE.2903.hh \ mln/core/concept/browsing.hh \ mln/core/pixel.hh \ mln/core/clock_neighb2d.hh \ diff --git a/milena/mln/convert/from_to.hh b/milena/mln/convert/from_to.hh index ceaada6..149b115 100644 --- a/milena/mln/convert/from_to.hh +++ b/milena/mln/convert/from_to.hh @@ -33,25 +33,27 @@ /// General conversion procedure between two objects. /// /// \todo Test the effectiveness of guards. -/// \todo Add fwd decls. /// \todo Dispatch code in appropriate files. -# include <mln/core/concept/object.hh> -# include <mln/core/concept/gpoint.hh> -# include <mln/value/concept/all.hh> - # include <mln/convert/impl/all.hh> # include <mln/convert/from_to.hxx> -# include <mln/algebra/vec.hh> -# include <mln/metal/is.hh> # include <mln/metal/abort.hh> +# include <mln/metal/converts_to.hh> +# include <mln/metal/is.hh> +# include <mln/metal/is_a.hh> namespace mln { + // Forward declarations. + template <typename E> struct Object; + template <typename E> struct Value; + template <typename E> struct Site_Set; + template <typename E> struct Image; + namespace convert { @@ -149,7 +151,8 @@ namespace mln from_to_dispatch(metal::true_, const F& from, metal::true_, T& to) { - internal::from_to_dispatch(typename mlc_converts_to(F, T)::eval(), + typedef mlc_converts_to(F, T) F_converts_to_T; + internal::from_to_dispatch(F_converts_to_T(), exact(from), exact(to)); } diff --git a/milena/mln/convert/impl/from_image_to_site_set.hh b/milena/mln/convert/impl/from_image_to_site_set.hh index 0af1a7a..6304117 100644 --- a/milena/mln/convert/impl/from_image_to_site_set.hh +++ b/milena/mln/convert/impl/from_image_to_site_set.hh @@ -37,8 +37,6 @@ /// \todo Add (?) the case p_run-based -> site set. # include <utility> -# include <mln/core/concept/image.hh> -# include <mln/core/concept/site_set.hh> # include <mln/core/site_set/p_run.hh> # include <mln/metal/converts_to.hh> @@ -47,6 +45,11 @@ namespace mln { + // Forward declarations. + template <typename E> struct Site_Set; + template <typename E> struct Image; + template <typename E> struct Gpoint; + namespace convert { diff --git a/milena/mln/core/routine/init.hh b/milena/mln/core/routine/init.hh index 476c374..03bf405 100644 --- a/milena/mln/core/routine/init.hh +++ b/milena/mln/core/routine/init.hh @@ -37,7 +37,7 @@ # include <mln/geom/bbox.hh> # include <mln/border/find.hh> -# include <core/routine/init.hxx> +# include <mln/core/routine/init.hxx> namespace mln diff --git a/milena/mln/core/site_set/operators.hh b/milena/mln/core/site_set/operators.hh index 4c34368..fd2b7b7 100644 --- a/milena/mln/core/site_set/operators.hh +++ b/milena/mln/core/site_set/operators.hh @@ -37,6 +37,7 @@ # include <algorithm> +# include <mln/convert/from_to.hh> # include <mln/core/concept/site_set.hh> @@ -122,7 +123,7 @@ namespace mln sym_diff_std_set(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs) { typedef mln_site(Sl) P; - mlc_converts_to(mln_psite(Sr), P)::check(); + mlc_converts_to(mln_psite(Sr), P)::check(); std::set< P, util::ord<P> > sl, sr, sd; convert::from_to(lhs, sl); convert::from_to(rhs, sr); @@ -149,7 +150,7 @@ namespace mln leq_std_set(const Site_Set<Sl>& lhs, const Site_Set<Sr>& rhs) { typedef mln_site(Sl) P; - mlc_converts_to(mln_psite(Sr), P)::check(); + mlc_converts_to(mln_psite(Sr), P)::check(); std::set< P, util::ord<P> > sl, sr; convert::from_to(lhs, sl); convert::from_to(rhs, sr); @@ -172,7 +173,7 @@ namespace mln ++n; return n; } - + template <typename S> inline unsigned set_card_dispatch_(mln::trait::site_set::nsites::known, @@ -180,7 +181,7 @@ namespace mln { return s.nsites(); } - + template <typename S> inline unsigned set_card(const Site_Set<S>& s) diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index c8fc350..a3c3035 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -814,13 +814,11 @@ mln_core_concept_weighted_window \ mln_core_concept_all \ mln_core_concept_gpoint \ mln_core_concept_site_iterator \ -mln_core_concept_window_LOCAL_2903.cc \ mln_core_concept_point \ mln_core_concept_literal \ mln_core_concept_pixel_iterator \ mln_core_concept_value_iterator \ mln_core_concept_meta_accumulator \ -mln_core_concept_window_BASE_2903.cc \ mln_core_concept_gdpoint \ mln_core_concept_regular_grid \ mln_core_concept_mesh \ @@ -834,7 +832,6 @@ mln_core_concept_object \ mln_core_concept_meta_fun \ mln_core_concept_delta_point_site \ mln_core_concept_neighborhood \ -mln_core_concept_window_REMOTE_2903.cc \ mln_core_concept_browsing \ mln_core_pixel \ mln_core_clock_neighb2d \ @@ -1820,13 +1817,11 @@ mln_core_concept_weighted_window_SOURCES = mln_core_concept_weighted_window.cc mln_core_concept_all_SOURCES = mln_core_concept_all.cc mln_core_concept_gpoint_SOURCES = mln_core_concept_gpoint.cc mln_core_concept_site_iterator_SOURCES = mln_core_concept_site_iterator.cc -mln_core_concept_window_LOCAL_2903_SOURCES = mln_core_concept_window.cc_LOCAL_2903.cc mln_core_concept_point_SOURCES = mln_core_concept_point.cc mln_core_concept_literal_SOURCES = mln_core_concept_literal.cc mln_core_concept_pixel_iterator_SOURCES = mln_core_concept_pixel_iterator.cc mln_core_concept_value_iterator_SOURCES = mln_core_concept_value_iterator.cc mln_core_concept_meta_accumulator_SOURCES = mln_core_concept_meta_accumulator.cc -mln_core_concept_window_BASE_2903_SOURCES = mln_core_concept_window.cc_BASE_2903.cc mln_core_concept_gdpoint_SOURCES = mln_core_concept_gdpoint.cc mln_core_concept_regular_grid_SOURCES = mln_core_concept_regular_grid.cc mln_core_concept_mesh_SOURCES = mln_core_concept_mesh.cc @@ -1840,7 +1835,6 @@ mln_core_concept_object_SOURCES = mln_core_concept_object.cc mln_core_concept_meta_fun_SOURCES = mln_core_concept_meta_fun.cc mln_core_concept_delta_point_site_SOURCES = mln_core_concept_delta_point_site.cc mln_core_concept_neighborhood_SOURCES = mln_core_concept_neighborhood.cc -mln_core_concept_window_REMOTE_2903_SOURCES = mln_core_concept_window.cc_REMOTE_2903.cc mln_core_concept_browsing_SOURCES = mln_core_concept_browsing.cc mln_core_pixel_SOURCES = mln_core_pixel.cc mln_core_clock_neighb2d_SOURCES = mln_core_clock_neighb2d.cc -- 1.5.6.5