URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-25 Matthieu Garrigues &lt;garrigues(a)lrde.epita.fr&gt; Rename image_identity_morpher_ to image_identity_. * mln/core/internal/image_identity_morpher.hh, * mln/core/decorated_image.hh, * mln/core/interpolated.hh, * mln/core/safe.hh: Rename. --- decorated_image.hh | 4 ++-- internal/image_identity_morpher.hh | 26 +++++++++++++------------- interpolated.hh | 4 ++-- safe.hh | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) Index: trunk/milena/mln/core/decorated_image.hh =================================================================== --- trunk/milena/mln/core/decorated_image.hh (revision 1170) +++ trunk/milena/mln/core/decorated_image.hh (revision 1171) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_DECORATED_IMAGE_HH # define MLN_CORE_DECORATED_IMAGE_HH -# include <mln/core/internal/image_identity_morpher.hh> +# include <mln/core/internal/image_identity.hh> # include <mln/value/proxy.hh> @@ -74,7 +74,7 @@ template <typename I, typename D> struct decorated_image : public internal::decorated_image_impl_< I, decorated_image<I,D> >, - public internal::image_identity_morpher_< I, mln_pset(I), decorated_image<I,D> > + public internal::image_identity_< I, mln_pset(I), decorated_image<I,D> > { public: typedef decorated_image<I, D> self_; Index: trunk/milena/mln/core/internal/image_identity_morpher.hh =================================================================== --- trunk/milena/mln/core/internal/image_identity_morpher.hh (revision 1170) +++ trunk/milena/mln/core/internal/image_identity_morpher.hh (revision 1171) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_INTERNAL_IMAGE_IDENTITY_MORPHER_HH -# define MLN_CORE_INTERNAL_IMAGE_IDENTITY_MORPHER_HH +#ifndef MLN_CORE_INTERNAL_IMAGE_IDENTITY_HH +# define MLN_CORE_INTERNAL_IMAGE_IDENTITY_HH -/*! \file mln/core/internal/image_identity_morpher.hh +/*! \file mln/core/internal/image_identity.hh * * \brief Definition of a base class for image morphers w.r.t. identity. */ @@ -50,7 +50,7 @@ * \internal */ template <typename I, typename S, typename E> - class image_identity_morpher_ : public image_morpher_<I, S, E> + class image_identity_ : public image_morpher_<I, S, E> { public: @@ -80,20 +80,20 @@ bool owns_(const mln_psite(I)& p) const; protected: - image_identity_morpher_(); + image_identity_(); }; # ifndef MLN_INCLUDE_ONLY template <typename I, typename S, typename E> - image_identity_morpher_<I,S,E>::image_identity_morpher_() + image_identity_<I,S,E>::image_identity_() { } template <typename I, typename S, typename E> const mln_vset(I)& - image_identity_morpher_<I,S,E>::values() const + image_identity_<I,S,E>::values() const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->values(); @@ -101,15 +101,15 @@ template <typename I, typename S, typename E> mln_rvalue(I) - image_identity_morpher_<I,S,E>::operator()(const mln_psite(S)& p) const + image_identity_<I,S,E>::operator()(const mln_psite(S)& p) const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->operator()(p); } template <typename I, typename S, typename E> - typename image_identity_morpher_<I,S,E>::lvalue - image_identity_morpher_<I,S,E>::operator()(const mln_psite(S)& p) + typename image_identity_<I,S,E>::lvalue + image_identity_<I,S,E>::operator()(const mln_psite(S)& p) { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->operator()(p); @@ -117,7 +117,7 @@ template <typename I, typename S, typename E> const mln_pset(I)& - image_identity_morpher_<I,S,E>::domain() const + image_identity_<I,S,E>::domain() const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->domain(); @@ -125,7 +125,7 @@ template <typename I, typename S, typename E> bool - image_identity_morpher_<I,S,E>::owns_(const mln_psite(I)& p) const + image_identity_<I,S,E>::owns_(const mln_psite(I)& p) const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->owns_(p); @@ -137,4 +137,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_INTERNAL_IMAGE_IDENTITY_MORPHER_HH +#endif // ! MLN_CORE_INTERNAL_IMAGE_IDENTITY_HH Index: trunk/milena/mln/core/interpolated.hh =================================================================== --- trunk/milena/mln/core/interpolated.hh (revision 1170) +++ trunk/milena/mln/core/interpolated.hh (revision 1171) @@ -35,7 +35,7 @@ # include <cmath> -# include <mln/core/internal/image_identity_morpher.hh> +# include <mln/core/internal/image_identity.hh> # include <mln/metal/vec.hh> @@ -62,7 +62,7 @@ * */ template <typename I> - struct interpolated : public mln::internal::image_identity_morpher_< I, mln_pset(I), interpolated<I> > + struct interpolated : public mln::internal::image_identity_< I, mln_pset(I), interpolated<I> > { /// Point_Site associated type. typedef mln_psite(I) psite; Index: trunk/milena/mln/core/safe.hh =================================================================== --- trunk/milena/mln/core/safe.hh (revision 1170) +++ trunk/milena/mln/core/safe.hh (revision 1171) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_SAFE_HH # define MLN_CORE_SAFE_HH -# include <mln/core/internal/image_identity_morpher.hh> +# include <mln/core/internal/image_identity.hh> namespace mln @@ -55,9 +55,9 @@ // FIXME: Doc! template <typename I> - class safe_image : public internal::image_identity_morpher_< I, mln_pset(I), safe_image<I> > + class safe_image : public internal::image_identity_< I, mln_pset(I), safe_image<I> > { - typedef internal::image_identity_morpher_< I, mln_pset(I), safe_image<I> > super_; + typedef internal::image_identity_< I, mln_pset(I), safe_image<I> > super_; public: /// Skeleton.