* mln/core/macros.hh (mln_face, mln_face_): Remove macros. * mln/topo/internal/complex_relative_iterator_sequence: Adjust. (internal/complex_relative_iterator_sequence<I1, I2, E>::face): Rename typedef as... (internal/complex_relative_iterator_sequence<I1, I2, E>::face_type): ...this. --- milena/ChangeLog | 11 +++++++++++ milena/mln/core/macros.hh | 6 ------ .../internal/complex_relative_iterator_sequence.hh | 14 +++++++------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 524fd7c..f6299c9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2008-10-23 Roland Levillain <roland@lrde.epita.fr> + + Remove seldom used macros mln_face and mln_face_. + + * mln/core/macros.hh (mln_face, mln_face_): Remove macros. + * mln/topo/internal/complex_relative_iterator_sequence: Adjust. + (internal/complex_relative_iterator_sequence<I1, I2, E>::face): + Rename typedef as... + (internal/complex_relative_iterator_sequence<I1, I2, E>::face_type): + ...this. + 2008-10-23 Guillaume Lazzara <z@lrde.epita.fr> Update tutorial. diff --git a/milena/mln/core/macros.hh b/milena/mln/core/macros.hh index afbf50c..130cb89 100644 --- a/milena/mln/core/macros.hh +++ b/milena/mln/core/macros.hh @@ -146,12 +146,6 @@ // f -/// Shortcuts to access the (complex) face type associated to T. -/// \{ -# define mln_face(T) typename T::face -# define mln_face_(T) T::face -/// \} - /// Shortcuts to access the element-forward-iterator type associated /// to T. /// \{ diff --git a/milena/mln/topo/internal/complex_relative_iterator_sequence.hh b/milena/mln/topo/internal/complex_relative_iterator_sequence.hh index 424ff71..d0756f4 100644 --- a/milena/mln/topo/internal/complex_relative_iterator_sequence.hh +++ b/milena/mln/topo/internal/complex_relative_iterator_sequence.hh @@ -64,7 +64,7 @@ namespace mln public: /// The type of the iterated faces. - typedef mln_face(I1) face; + typedef typename I1::face_type face_type; /// Construction and assignment. /// \{ @@ -92,7 +92,7 @@ namespace mln /// Conversion. /// \{ /// Return a reference to the corresponding face handle. - operator const face&() const; + operator const face_type&() const; /// \} protected: @@ -106,7 +106,7 @@ namespace mln I2 iter2_; /// The face handle this iterator is pointing to. - face f_; + face_type f_; }; @@ -126,7 +126,7 @@ namespace mln complex_relative_iterator_sequence<I1, I2, E>::complex_relative_iterator_sequence() { // Ensure I1 and I2 are compatible. - mlc_equal(mln_face(I1), mln_face(I2))::check(); + mlc_equal(typename I1::face_type, typename I2::face_type)::check(); invalidate(); } @@ -137,7 +137,7 @@ namespace mln complex_relative_iterator_sequence<I1, I2, E>::complex_relative_iterator_sequence(const Fref& f_ref) { // Ensure I1 and I2 are compatible. - mlc_equal(mln_face(I1), mln_face(I2))::check(); + mlc_equal(typename I1::face_type, typename I2::face_type)::check(); center_at(f_ref); } @@ -209,7 +209,7 @@ namespace mln template <typename I1, typename I2, typename E> inline - complex_relative_iterator_sequence<I1, I2, E>::operator const face&() const + complex_relative_iterator_sequence<I1, I2, E>::operator const face_type&() const { return f_; } @@ -221,7 +221,7 @@ namespace mln operator<<(std::ostream& ostr, const complex_relative_iterator_sequence<I1, I2, E>& p) { - return ostr << mln_face(I1)(p); + return ostr << typename I1::face_type(p); } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5