[Olena-patches] last-svn-commit-206-gee56e13 Rename topo::detach as topo::detach_cell.

* mln/topo/detach.hh (detach): Rename as... * mln/topo/detach_cell.hh (detach_cell): ...this, to prevent confusions with detach_point. * headers.mk: Regen. --- milena/ChangeLog | 9 +++++++++ milena/headers.mk | 2 +- milena/mln/topo/{detach.hh => detach_cell.hh} | 12 ++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) rename milena/mln/topo/{detach.hh => detach_cell.hh} (87%) diff --git a/milena/ChangeLog b/milena/ChangeLog index e3b6019..3f871ab 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-09-15 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Rename topo::detach as topo::detach_cell. + + * mln/topo/detach.hh (detach): Rename as... + * mln/topo/detach_cell.hh (detach_cell): ...this, to prevent + confusions with detach_point. + * headers.mk: Regen. + +2010-09-15 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Exercise breadth-first and priority-driven thinnings. * tests/topo/skeleton/breadth_first_thinning.cc, diff --git a/milena/headers.mk b/milena/headers.mk index fd6169c..90dd918 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -994,7 +994,7 @@ mln/topo/center_only_iter.hh \ mln/topo/centered_iter_adapter.hh \ mln/topo/complex.hh \ mln/topo/complex_iterators.hh \ -mln/topo/detach.hh \ +mln/topo/detach_cell.hh \ mln/topo/detach_point.hh \ mln/topo/essential.hh \ mln/topo/face.hh \ diff --git a/milena/mln/topo/detach.hh b/milena/mln/topo/detach_cell.hh similarity index 87% rename from milena/mln/topo/detach.hh rename to milena/mln/topo/detach_cell.hh index 6218739..dfc4fb5 100644 --- a/milena/mln/topo/detach.hh +++ b/milena/mln/topo/detach_cell.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,8 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_TOPO_DETACH_HH -# define MLN_TOPO_DETACH_HH +#ifndef MLN_TOPO_DETACH_CELL_HH +# define MLN_TOPO_DETACH_CELL_HH /// \file /// \brief Detaching a cell from a binary complex-based image. @@ -47,7 +47,7 @@ namespace mln \pre \a ima is an image of Boolean values. */ template <unsigned D, typename G> void - detach(const complex_psite<D, G>& f, complex_image<D, G, bool>& ima); + detach_cell(const complex_psite<D, G>& f, complex_image<D, G, bool>& ima); # ifndef MLN_INCLUDE_ONLY @@ -55,7 +55,7 @@ namespace mln template <unsigned D, typename G> inline void - detach(const complex_psite<D, G>& f, complex_image<D, G, bool>& ima) + detach_cell(const complex_psite<D, G>& f, complex_image<D, G, bool>& ima) { mln_precondition(topo::is_facet(f)); @@ -80,4 +80,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_TOPO_DETACH_HH +#endif // ! MLN_TOPO_DETACH_CELL_HH -- 1.5.6.5