--- milena/ChangeLog | 9 +++++++-- milena/mln/core/point.hh | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f960f53..e853813 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2010-08-11 Guillaume Lazzara <z@lrde.epita.fr> + * mln/core/point.hh: Fix a warning. + +2010-08-11 Guillaume Lazzara <z@lrde.epita.fr> + Fix tests in Milena. * mln/draw/dashed_line.hh, @@ -11,8 +15,9 @@ * tests/topo/skeleton/crest.cc: Fix reference results since a bug have been fixed. - * tests/unit_test/cond_tests_qt - * tests/unit_test/unit-tests.mk + * tests/unit_test/cond_tests_qt: Add conditional tests. + + * tests/unit_test/unit-tests.mk: Regen. 2010-08-11 Guillaume Lazzara <z@lrde.epita.fr> diff --git a/milena/mln/core/point.hh b/milena/mln/core/point.hh index 4dc7c5e..df1fc2c 100644 --- a/milena/mln/core/point.hh +++ b/milena/mln/core/point.hh @@ -276,7 +276,7 @@ namespace mln C convert_data_(metal::bool_<true>, const C2& v) { - return round(v); + return static_cast<C>(round(v)); } template <typename C, typename C2> -- 1.5.6.5