[Olena-patches] 3090: Fix from_to related errors.

* mln/core/concept/window.hh: rename from_to as from_to_. * mln/core/site_set/operators.hh: remove the inclusion of from_to.hh and directly call from_to_ overloads instead of the facade. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/concept/window.hh | 2 +- milena/mln/core/site_set/operators.hh | 11 +++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8e4bb36..d822b99 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2008-12-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix from_to related errors. + + * mln/core/concept/window.hh: rename from_to as from_to_. + + * mln/core/site_set/operators.hh: remove the inclusion of from_to.hh + and directly call from_to_ overloads instead of the facade. + 2008-12-29 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; Fix issues with GCC 2.95. diff --git a/milena/mln/core/concept/window.hh b/milena/mln/core/concept/window.hh index 71b22d6..0b6ba51 100644 --- a/milena/mln/core/concept/window.hh +++ b/milena/mln/core/concept/window.hh @@ -317,7 +317,7 @@ namespace mln template <typename W, typename I> void - from_to(const Window<W>& win_, Image<I>& ima_) + from_to_(const Window<W>& win_, Image<I>& ima_) { mln_is_simple_window(W)::check(); typedef mln_psite(I) P; diff --git a/milena/mln/core/site_set/operators.hh b/milena/mln/core/site_set/operators.hh index fd2b7b7..ff788b2 100644 --- a/milena/mln/core/site_set/operators.hh +++ b/milena/mln/core/site_set/operators.hh @@ -37,7 +37,6 @@ # include <algorithm> -# include <mln/convert/from_to.hh> # include <mln/core/concept/site_set.hh> @@ -125,8 +124,8 @@ namespace mln typedef mln_site(Sl) P; 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); + convert::over_load::from_to_(lhs, sl); + convert::over_load::from_to_(rhs, sr); std::set_symmetric_difference(sl.begin(), sl.end(), sr.begin(), sr.end(), std::inserter(sd, sd.begin()), @@ -140,7 +139,7 @@ namespace mln to_std_set(const Site_Set<S>& s) { std::set< mln_site(S), util::ord<mln_site(S)> > std_s; - convert::from_to(s, std_s); + convert::over_load::from_to_(s, std_s); return std_s; } @@ -152,8 +151,8 @@ namespace mln typedef mln_site(Sl) P; 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); + convert::over_load::from_to_(lhs, sl); + convert::over_load::from_to_(rhs, sr); return std::includes(sr.begin(), sr.end(), sl.begin(), sl.end(), util::ord<P>()); -- 1.5.6.5