https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Clean up morphers. * oln/morpher/identity.hh (oln::vtypes< morpher::identity<Image> >): Remove (was useless). (oln/morpher/tags.hh): Move header inclusion... * oln/morpher/internal/image_extension.hh: ...here * oln/morpher/add_neighborhood.hh, oln/morpher/add_isubset.hh (oln/morpher/tags.hh): No longer include it. * oln/morpher/tags.hh (oln::morpher::tag::add_neighborhood): Remove (was useless). (oln::morpher::tag::identity): Adjust documentation. add_isubset.hh | 1 - add_neighborhood.hh | 1 - identity.hh | 11 ----------- internal/image_extension.hh | 1 + tags.hh | 4 +--- 5 files changed, 2 insertions(+), 16 deletions(-) Index: oln/morpher/identity.hh --- oln/morpher/identity.hh (revision 602) +++ oln/morpher/identity.hh (working copy) @@ -29,7 +29,6 @@ # define OLN_MORPHER_IDENTITY # include <oln/morpher/internal/image_extension.hh> -# include <oln/morpher/tags.hh> namespace oln @@ -52,16 +51,6 @@ }; - /// New virtual types associated with oln::morpher::identity. - /// \{ - template <typename Image> - struct vtypes< morpher::identity<Image> > - { - typedef oln::morpher::tag::identity morpher_type; - }; - /// \} - - namespace morpher { /// Identity morpher. Index: oln/morpher/internal/image_extension.hh --- oln/morpher/internal/image_extension.hh (revision 602) +++ oln/morpher/internal/image_extension.hh (working copy) @@ -29,6 +29,7 @@ # define OLN_MORPHER_INTERNAL_IMAGE_EXTENSION # include <oln/core/image_entry.hh> +# include <oln/morpher/tags.hh> namespace oln Index: oln/morpher/add_neighborhood.hh --- oln/morpher/add_neighborhood.hh (revision 602) +++ oln/morpher/add_neighborhood.hh (working copy) @@ -29,7 +29,6 @@ # define OLN_MORPHER_ADD_NEIGHBORHOOD # include <oln/morpher/internal/image_extension.hh> -# include <oln/morpher/tags.hh> # include <oln/core/gen/topo_add_nbh.hh> Index: oln/morpher/add_isubset.hh --- oln/morpher/add_isubset.hh (revision 602) +++ oln/morpher/add_isubset.hh (working copy) @@ -29,7 +29,6 @@ # define OLN_MORPHER_ADD_ISUBSET # include <oln/morpher/internal/image_extension.hh> -# include <oln/morpher/tags.hh> # include <oln/core/gen/topo_add_isubset.hh> # include <oln/core/gen/piter_isubset.hh> Index: oln/morpher/tags.hh --- oln/morpher/tags.hh (revision 602) +++ oln/morpher/tags.hh (working copy) @@ -35,10 +35,8 @@ { namespace tag { - /// Tag associated to oln::morpher::identity. + /// Tag associated to oln::morpher::image_extension. struct identity; - /// Tag associated to oln::morpher::add_neighborhood. - struct add_neighborhood; } // end of namespace oln::morpher::tag