* mln/core/image/dmorph/extension_fun.hh, * mln/core/image/dmorph/extension_ima.hh, * mln/core/image/dmorph/extension_val.hh: typedef 'value' in concrete classes. --- milena/ChangeLog | 12 +++++++++++- milena/mln/core/image/dmorph/extension_fun.hh | 2 ++ milena/mln/core/image/dmorph/extension_ima.hh | 6 ++++-- milena/mln/core/image/dmorph/extension_val.hh | 2 ++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 493a76c..b311841 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-07-06 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> + Fix ambiguous typedef 'value'. + + * mln/core/image/dmorph/extension_fun.hh, + * mln/core/image/dmorph/extension_ima.hh, + * mln/core/image/dmorph/extension_val.hh: typedef 'value' in + concrete classes. + + +2009-07-06 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> + Fix compilation issues with icc and meta accumulators. * mln/core/concept/meta_accumulator.hh: introduce a helper to help @@ -149,7 +159,7 @@ * mln/transformation/all.hh, * mln/transformation/essential.hh, * tests/transformation/Makefile.am: Remove. - + * tests/geom/Makefile.am: add rotate. 2009-06-29 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> diff --git a/milena/mln/core/image/dmorph/extension_fun.hh b/milena/mln/core/image/dmorph/extension_fun.hh index aea8dac..a8731c2 100644 --- a/milena/mln/core/image/dmorph/extension_fun.hh +++ b/milena/mln/core/image/dmorph/extension_fun.hh @@ -105,6 +105,8 @@ namespace mln /// Skeleton. typedef extension_fun< tag::image_<I>, tag::function_<F> > skeleton; + /// Image value type. + typedef mln_value(I) value; /// Return type of read-only access. typedef mln_value(I) rvalue; diff --git a/milena/mln/core/image/dmorph/extension_ima.hh b/milena/mln/core/image/dmorph/extension_ima.hh index 269a0e7..a0bc9ca 100644 --- a/milena/mln/core/image/dmorph/extension_ima.hh +++ b/milena/mln/core/image/dmorph/extension_ima.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -103,11 +104,12 @@ namespace mln /// Skeleton. typedef extension_ima< tag::image_<I>, tag::ext_<J> > skeleton; + /// Image value type. + typedef mln_value(I) value; /// Return type of read-only access. typedef mln_value(I) rvalue; - /// Constructor without argument. extension_ima(); diff --git a/milena/mln/core/image/dmorph/extension_val.hh b/milena/mln/core/image/dmorph/extension_val.hh index cf2fc29..c104eba 100644 --- a/milena/mln/core/image/dmorph/extension_val.hh +++ b/milena/mln/core/image/dmorph/extension_val.hh @@ -103,6 +103,8 @@ namespace mln /// Skeleton. typedef extension_val< tag::image_<I> > skeleton; + /// Image value type. + typedef mln_value(I) value; /// Return type of read-only access. typedef mln_value(I) rvalue; -- 1.5.6.5