--- milena/ChangeLog | 4 ++++ milena/mln/fun/i2v/array.hh | 23 +++-------------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8de7538..ac8a3fa 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-08-17 Guillaume Lazzara <lazzara@lrde.epita.fr> + * mln/fun/i2v/array.hh: Use fun::internal::selector_from_result. + +2009-08-17 Guillaume Lazzara <lazzara@lrde.epita.fr> + * mln/labeling/relabel.hh: Add missing preconditions. 2009-08-17 Guillaume Lazzara <lazzara@lrde.epita.fr> diff --git a/milena/mln/fun/i2v/array.hh b/milena/mln/fun/i2v/array.hh index 209623c..f60629d 100644 --- a/milena/mln/fun/i2v/array.hh +++ b/milena/mln/fun/i2v/array.hh @@ -37,6 +37,7 @@ # include <mln/metal/equal.hh> # include <mln/tag/init.hh> +# include <mln/fun/internal/selector.hh> namespace mln { @@ -88,27 +89,9 @@ namespace mln namespace i2v { - - namespace internal - { - - template <typename T, bool B = false > - struct array_selector_ - : public Function_v2v< i2v::array<T> > - { - }; - - template <typename T> - struct array_selector_<T,true> - : public Function_v2b< i2v::array<T> > - { - }; - - } // end of namespace mln::fun::i2v::internal - - template <typename T> - class array : public internal::array_selector_<T,mlc_equal(T,bool)::value> + class array + : public fun::internal::selector_from_result_<T, array<T> >::ret { public: -- 1.5.6.5