* mln/fun/v2v/saturate.hh: Add mln:: namespace prefix. * mln/value/rgb.hh: Add a missing include. * mln/accu/tuple.hh: Update include directive syntax. --- milena/ChangeLog | 10 ++++++++++ milena/mln/accu/tuple.hh | 13 +++++++------ milena/mln/fun/v2v/saturate.hh | 2 +- milena/mln/value/rgb.hh | 2 ++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 489ca03..f655e6b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-08-12 Guillaume Lazzara <z@lrde.epita.fr> + Small fixes in Milena. + + * mln/fun/v2v/saturate.hh: Add mln:: namespace prefix. + + * mln/value/rgb.hh: Add a missing include. + + * mln/accu/tuple.hh: Update include directive syntax. + +2010-08-12 Guillaume Lazzara <z@lrde.epita.fr> + Fix more warnings in Milena. * mln/convert/impl/from_float_to_value.hh: Add an overload for diff --git a/milena/mln/accu/tuple.hh b/milena/mln/accu/tuple.hh index 19ebdea..52e2ffa 100644 --- a/milena/mln/accu/tuple.hh +++ b/milena/mln/accu/tuple.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -39,11 +40,11 @@ # include <mln/metal/is_a.hh> # include <mln/metal/unqualif.hh> -# include "boost/tuple/tuple.hpp" -# include "boost/preprocessor/iteration/local.hpp" -# include "boost/preprocessor/repetition/repeat.hpp" -# include "boost/preprocessor/repetition/enum_params.hpp" -# include "boost/preprocessor/repetition/enum_params_with_a_default.hpp" +# include <boost/tuple/tuple.hpp> +# include <boost/preprocessor/iteration/local.hpp> +# include <boost/preprocessor/repetition/repeat.hpp> +# include <boost/preprocessor/repetition/enum_params.hpp> +# include <boost/preprocessor/repetition/enum_params_with_a_default.hpp> # define RESULT_ACCU(z, n, data) BOOST_PP_COMMA_IF(n) typename internal::tuplehelper_<T ## n>::result # define ARG(z, n, data) BOOST_PP_COMMA_IF(n) const T ## n& p ## n = T ## n() diff --git a/milena/mln/fun/v2v/saturate.hh b/milena/mln/fun/v2v/saturate.hh index 3c38062..9a354c6 100644 --- a/milena/mln/fun/v2v/saturate.hh +++ b/milena/mln/fun/v2v/saturate.hh @@ -116,7 +116,7 @@ namespace mln return max_; V output; - convert::from_to(w, output); + mln::convert::from_to(w, output); return output; } diff --git a/milena/mln/value/rgb.hh b/milena/mln/value/rgb.hh index 89ffce6..c9d2f53 100644 --- a/milena/mln/value/rgb.hh +++ b/milena/mln/value/rgb.hh @@ -37,6 +37,8 @@ # include <mln/value/internal/make_generic_name.hh> +# include <mln/convert/from_to.hh> + // FIXME: should we consider that mln_min may be negative? => wrong // color formulae. -- 1.5.6.5