* mln/geom/max_col.hh, * mln/geom/max_row.hh, * mln/geom/min_col.hh, * mln/geom/min_row.hh: Replace deduced type 'point' by 'site'. --- milena/ChangeLog | 9 +++++++++ milena/mln/geom/max_col.hh | 8 ++++---- milena/mln/geom/max_row.hh | 8 ++++---- milena/mln/geom/min_col.hh | 8 ++++---- milena/mln/geom/min_row.hh | 8 ++++---- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 877da7c..710cfc9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2010-08-04 Guillaume Lazzara <z@lrde.epita.fr> + + Replace deduced type 'point' by 'site'. + + * mln/geom/max_col.hh, + * mln/geom/max_row.hh, + * mln/geom/min_col.hh, + * mln/geom/min_row.hh: Replace deduced type 'point' by 'site'. + 2010-07-06 Guillaume Lazzara <z@lrde.epita.fr> Small fixes in milena. diff --git a/milena/mln/geom/max_col.hh b/milena/mln/geom/max_col.hh index 36eb213..ba88090 100644 --- a/milena/mln/geom/max_col.hh +++ b/milena/mln/geom/max_col.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -47,7 +47,7 @@ namespace mln /// Give the maximum col of an box 2d or 3d. template <typename B> - mln_deduce(B, point, coord) max_col(const Box<B>& b); + mln_deduce(B, site, coord) max_col(const Box<B>& b); # ifndef MLN_INCLUDE_ONLY @@ -64,10 +64,10 @@ namespace mln template <typename B> inline - mln_deduce(B, point, coord) max_col(const Box<B>& b) + mln_deduce(B, site, coord) max_col(const Box<B>& b) { metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - mln_deduce(B, point, coord) maxcol = exact(b).pmax().col(); + mln_deduce(B, site, coord) maxcol = exact(b).pmax().col(); return maxcol; } diff --git a/milena/mln/geom/max_row.hh b/milena/mln/geom/max_row.hh index 6519906..cd79e94 100644 --- a/milena/mln/geom/max_row.hh +++ b/milena/mln/geom/max_row.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -48,7 +48,7 @@ namespace mln /// Give the maximum row of an box 2d or 3d. template <typename B> - mln_deduce(B, point, coord) max_row(const Box<B>& b); + mln_deduce(B, site, coord) max_row(const Box<B>& b); # ifndef MLN_INCLUDE_ONLY @@ -65,10 +65,10 @@ namespace mln template <typename B> inline - mln_deduce(B, point, coord) max_row(const Box<B>& b) + mln_deduce(B, site, coord) max_row(const Box<B>& b) { metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - mln_deduce(B, point, coord) maxrow = exact(b).pmax().row(); + mln_deduce(B, site, coord) maxrow = exact(b).pmax().row(); return maxrow; } diff --git a/milena/mln/geom/min_col.hh b/milena/mln/geom/min_col.hh index 373237e..ddf43b4 100644 --- a/milena/mln/geom/min_col.hh +++ b/milena/mln/geom/min_col.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -47,7 +47,7 @@ namespace mln /// Give the minimum column of an box 2d or 3d. template <typename B> - mln_deduce(B, point, coord) min_col(const Box<B>& b); + mln_deduce(B, site, coord) min_col(const Box<B>& b); # ifndef MLN_INCLUDE_ONLY @@ -65,10 +65,10 @@ namespace mln template <typename B> inline - mln_deduce(B, point, coord) min_col(const Box<B>& b) + mln_deduce(B, site, coord) min_col(const Box<B>& b) { metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - mln_deduce(B, point, coord) mincol = exact(b).pmin().col(); + mln_deduce(B, site, coord) mincol = exact(b).pmin().col(); return mincol; } diff --git a/milena/mln/geom/min_row.hh b/milena/mln/geom/min_row.hh index ec833c3..5503de2 100644 --- a/milena/mln/geom/min_row.hh +++ b/milena/mln/geom/min_row.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -50,7 +50,7 @@ namespace mln /// Give the minimum row of an box 2d or 3d. template <typename B> - mln_deduce(B, point, coord) min_row(const Box<B>& b); + mln_deduce(B, site, coord) min_row(const Box<B>& b); # ifndef MLN_INCLUDE_ONLY @@ -68,10 +68,10 @@ namespace mln template <typename B> inline - mln_deduce(B, point, coord) min_row(const Box<B>& b) + mln_deduce(B, site, coord) min_row(const Box<B>& b) { metal::not_<metal::equal<metal::int_<B::dim>, metal::int_<1> > >::check(); - mln_deduce(B, point, coord) minrow = exact(b).pmin().row(); + mln_deduce(B, site, coord) minrow = exact(b).pmin().row(); return minrow; } -- 1.5.6.5