[Olena-patches] milena r1238: Remove convertion method in median_alt

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-04 Matthieu Garrigues &lt;garrigues(a)lrde.epita.fr&gt; Remove convertion method in median_alt. * mln/accu/median_alt.hh: Move convertion method to the super class accu::internal::base_ * mln/accu/nil.hh, * mln/accu/p.hh: Clean old includes. --- median_alt.hh | 10 ++-------- nil.hh | 1 - p.hh | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) Index: trunk/milena/mln/accu/nil.hh =================================================================== --- trunk/milena/mln/accu/nil.hh (revision 1237) +++ trunk/milena/mln/accu/nil.hh (revision 1238) @@ -36,7 +36,6 @@ */ # include <mln/core/concept/meta_accumulator.hh> -# include <mln/core/concept/accumulator.hh> # include <mln/accu/internal/base.hh> # include <mln/util/eat.hh> # include <mln/util/ignore.hh> Index: trunk/milena/mln/accu/median_alt.hh =================================================================== --- trunk/milena/mln/accu/median_alt.hh (revision 1237) +++ trunk/milena/mln/accu/median_alt.hh (revision 1238) @@ -33,6 +33,7 @@ * \brief Define FIXME */ +# include <mln/accu/internal/base.hh> # include <mln/accu/histo.hh> @@ -47,7 +48,7 @@ * with type \c S. */ template <typename S> - struct median_alt + struct median_alt : : public mln::accu::internal::base_< mln_value(S), median_alt<S> > { typedef mln_value(S) value; @@ -57,7 +58,6 @@ void untake(const value& v); void init(); - operator mln_value(S) () const; value to_result() const; // FIXME: remove @@ -249,12 +249,6 @@ } template <typename S> - median_alt<S>::operator mln_value(S) () const - { - return v_; - } - - template <typename S> typename median_alt<S>::value median_alt<S>::to_result() const { Index: trunk/milena/mln/accu/p.hh =================================================================== --- trunk/milena/mln/accu/p.hh (revision 1237) +++ trunk/milena/mln/accu/p.hh (revision 1238) @@ -34,7 +34,6 @@ */ # include <mln/core/concept/meta_accumulator.hh> -# include <mln/core/concept/accumulator.hh> # include <mln/accu/internal/base.hh> # include <mln/metal/is_a.hh>