* mln/core/complex_psite.hh: Move... * mln/core/site_set/complex_psite.hh: ...here. Adjust headers guard and documentation. * mln/core/image/complex_image.hh, * mln/core/site_set/p_complex.hh: Adjust paths. --- milena/ChangeLog | 11 +++++++++++ milena/mln/core/image/complex_image.hh | 2 +- milena/mln/core/{ => site_set}/complex_psite.hh | 8 ++++---- milena/mln/core/site_set/p_complex.hh | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) rename milena/mln/core/{ => site_set}/complex_psite.hh (98%) diff --git a/milena/ChangeLog b/milena/ChangeLog index e782fee..72e9ec6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2008-09-24 Roland Levillain <roland@lrde.epita.fr> + Move mln/core/complex_psite.hh to mln/core/site_set/. + + * mln/core/complex_psite.hh: Move... + * mln/core/site_set/complex_psite.hh: ...here. + Adjust headers guard and documentation. + * mln/core/image/complex_image.hh, + * mln/core/site_set/p_complex.hh: + Adjust paths. + +2008-09-24 Roland Levillain <roland@lrde.epita.fr> + * tests/core/site_set/Makefile.am (p_bgraph_SOURCES): Disable. 2008-09-24 Roland Levillain <roland@lrde.epita.fr> diff --git a/milena/mln/core/image/complex_image.hh b/milena/mln/core/image/complex_image.hh index 09d6e13..a9cea01 100644 --- a/milena/mln/core/image/complex_image.hh +++ b/milena/mln/core/image/complex_image.hh @@ -38,7 +38,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/metal/vec.hh> # include <mln/core/site_set/p_complex.hh> -# include <mln/core/complex_psite.hh> +# include <mln/core/site_set/complex_psite.hh> # include <mln/value/set.hh> diff --git a/milena/mln/core/complex_psite.hh b/milena/mln/core/site_set/complex_psite.hh similarity index 98% rename from milena/mln/core/complex_psite.hh rename to milena/mln/core/site_set/complex_psite.hh index d6692e7..71dd84e 100644 --- a/milena/mln/core/complex_psite.hh +++ b/milena/mln/core/site_set/complex_psite.hh @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_COMPLEX_PSITE_HH -# define MLN_CORE_COMPLEX_PSITE_HH +#ifndef MLN_CORE_SITE_SET_COMPLEX_PSITE_HH +# define MLN_CORE_SITE_SET_COMPLEX_PSITE_HH -/// \file mln/core/complex_psite.hh +/// \file mln/core/site_set/complex_psite.hh /// \brief Definition of a complex-based point site. # include <mln/core/internal/pseudo_site_base.hh> @@ -370,4 +370,4 @@ namespace mln } // end of mln -#endif // MLN_CORE_COMPLEX_PSITE_HH +#endif // MLN_CORE_SITE_SET_COMPLEX_PSITE_HH diff --git a/milena/mln/core/site_set/p_complex.hh b/milena/mln/core/site_set/p_complex.hh index ecbc0fa..206cd34 100644 --- a/milena/mln/core/site_set/p_complex.hh +++ b/milena/mln/core/site_set/p_complex.hh @@ -35,7 +35,7 @@ # include <mln/topo/complex.hh> -# include <mln/core/complex_psite.hh> +# include <mln/core/site_set/complex_psite.hh> # include <mln/core/site_set/p_complex_piter.hh> # include <mln/core/site_set/p_complex_faces_piter.hh> -- 1.6.0.1