[Olena-patches] 2641: Use util::ord with std::set.

* mln/set/inter.hh, * mln/set/sym_diff.hh, * mln/set/uni.hh: Use util::ord as comparison operator. --- milena/ChangeLog | 10 ++++++++++ milena/mln/set/inter.hh | 3 ++- milena/mln/set/sym_diff.hh | 7 ++++--- milena/mln/set/uni.hh | 8 ++++---- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 75d390b..3aa06c7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2008-10-21 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Use util::ord with std::set. + + * mln/set/inter.hh, + * mln/set/sym_diff.hh, + * mln/set/uni.hh: + Use util::ord as comparison operator. + + +2008-10-21 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Add missing resize() method to util::array. * mln/util/array.hh: add resize(). diff --git a/milena/mln/set/inter.hh b/milena/mln/set/inter.hh index 5ad244f..39612e1 100644 --- a/milena/mln/set/inter.hh +++ b/milena/mln/set/inter.hh @@ -37,6 +37,7 @@ # include <mln/convert/to_std_set.hh> # include <mln/convert/to_p_set.hh> # include <mln/metal/equal.hh> +# include <mln/util/ord.hh> @@ -64,7 +65,7 @@ namespace mln trace::entering("set::inter"); mln::metal::equal<mln_psite(Wl), mln_psite(Wr)>::check(); typedef mln_psite(Wl) P; - std::set<P> + std::set<P, util::ord<P> > sl = convert::to_std_set(lhs), sr = convert::to_std_set(rhs), s; diff --git a/milena/mln/set/sym_diff.hh b/milena/mln/set/sym_diff.hh index ba65e09..6c970a0 100644 --- a/milena/mln/set/sym_diff.hh +++ b/milena/mln/set/sym_diff.hh @@ -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 @@ -37,6 +37,7 @@ # include <mln/convert/to_window.hh> # include <mln/convert/to_p_set.hh> # include <mln/metal/equal.hh> +# include <mln/util/ord.hh> @@ -72,7 +73,7 @@ namespace mln trace::entering("set::sym_diff"); mln::metal::equal<mln_dpoint(Wl), mln_dpoint(Wr)>::check(); typedef mln_dpoint(Wl) D; - std::set<D> + std::set<D, util::ord<D> > sl = convert::to_std_set(lhs), sr = convert::to_std_set(rhs), s; @@ -91,7 +92,7 @@ namespace mln trace::entering("set::sym_diff"); mln::metal::equal<mln_point(Wl), mln_point(Wr)>::check(); typedef mln_point(Wl) P; - std::set<P> + std::set<P, util::ord<P> > sl = convert::to_std_set(lhs), sr = convert::to_std_set(rhs), s; diff --git a/milena/mln/set/uni.hh b/milena/mln/set/uni.hh index a64a348..6bd6dd5 100644 --- a/milena/mln/set/uni.hh +++ b/milena/mln/set/uni.hh @@ -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 @@ -37,7 +37,7 @@ # include <mln/convert/to_window.hh> # include <mln/convert/to_p_set.hh> # include <mln/metal/equal.hh> - +# include <mln/util/ord.hh> namespace mln @@ -73,7 +73,7 @@ namespace mln trace::entering("set::uni"); mln::metal::equal<mln_dpoint(Wl), mln_dpoint(Wr)>::check(); typedef mln_dpoint(Wl) D; - std::set<D> + std::set<D, util::ord<D> > sl = convert::to_std_set(lhs), sr = convert::to_std_set(rhs), s; @@ -92,7 +92,7 @@ namespace mln trace::entering("set::uni"); mln::metal::equal<mln_point(Wl), mln_point(Wr)>::check(); typedef mln_point(Wl) P; - std::set<P> + std::set<P, util::ord<P> > sl = convert::to_std_set(lhs), sr = convert::to_std_set(rhs), s; -- 1.5.6.5