[Olena-patches] 2428: Help the compiler not to mix up typedefs and methods.

* mln/topo/face_iter.hh, * mln/topo/n_face_iter.hh, * mln/topo/static_n_face_iter.hh (mln::topo::face_fwd_iter<D>::face) (mln::topo::face_bkd_iter<D>::face) (mln::topo::n_face_fwd_iter<D>::face) (mln::topo::n_face_bkd_iter<D>::face) (mln::topo::static_n_face_fwd_iter<D>::face) (mln::topo::static_n_face_bkd_iter<D>::face): Remove typedef. (mln::topo::face_fwd_iter<D>::super_) (mln::topo::face_bkd_iter<D>::super_) (mln::topo::n_face_fwd_iter<D>::super_) (mln::topo::n_face_bkd_iter<D>::super_) (mln::topo::static_n_face_fwd_iter<D>::super_) (mln::topo::static_n_face_bkd_iter<D>::super_): Adjust. --- milena/ChangeLog | 22 ++++++++++++++++++++++ milena/mln/topo/face_iter.hh | 12 ++---------- milena/mln/topo/n_face_iter.hh | 12 ++---------- milena/mln/topo/static_n_face_iter.hh | 12 ++---------- 4 files changed, 28 insertions(+), 30 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f00feeb..19eda01 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,27 @@ 2008-09-29 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Help the compiler not to mix up typedefs and methods. + + * mln/topo/face_iter.hh, + * mln/topo/n_face_iter.hh, + * mln/topo/static_n_face_iter.hh + (mln::topo::face_fwd_iter<D>::face) + (mln::topo::face_bkd_iter<D>::face) + (mln::topo::n_face_fwd_iter<D>::face) + (mln::topo::n_face_bkd_iter<D>::face) + (mln::topo::static_n_face_fwd_iter<D>::face) + (mln::topo::static_n_face_bkd_iter<D>::face): + Remove typedef. + (mln::topo::face_fwd_iter<D>::super_) + (mln::topo::face_bkd_iter<D>::super_) + (mln::topo::n_face_fwd_iter<D>::super_) + (mln::topo::n_face_bkd_iter<D>::super_) + (mln::topo::static_n_face_fwd_iter<D>::super_) + (mln::topo::static_n_face_bkd_iter<D>::super_): + Adjust. + +2008-09-29 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + * mln/core/faces_psite.hh: Include csdtlib for abort(). 2008-09-29 Nicolas Ballas &lt;ballas(a)lrde.epita.fr&gt; diff --git a/milena/mln/topo/face_iter.hh b/milena/mln/topo/face_iter.hh index e366441..4de87cc 100644 --- a/milena/mln/topo/face_iter.hh +++ b/milena/mln/topo/face_iter.hh @@ -59,13 +59,9 @@ namespace mln class face_fwd_iter : public internal::complex_iter_base< face<D>, face_fwd_iter<D> > { - public: - /// Type of associated face. - typedef face<D> face; - private: typedef face_fwd_iter<D> self_; - typedef internal::complex_iter_base< face, self_ > super_; + typedef internal::complex_iter_base< face<D>, self_ > super_; public: using super_::is_valid; @@ -103,13 +99,9 @@ namespace mln class face_bkd_iter : public internal::complex_iter_base< face<D>, face_bkd_iter<D> > { - public: - /// Type of associated face. - typedef face<D> face; - private: typedef face_bkd_iter<D> self_; - typedef internal::complex_iter_base< face, self_ > super_; + typedef internal::complex_iter_base< face<D>, self_ > super_; public: using super_::is_valid; diff --git a/milena/mln/topo/n_face_iter.hh b/milena/mln/topo/n_face_iter.hh index 1156707..c4291e2 100644 --- a/milena/mln/topo/n_face_iter.hh +++ b/milena/mln/topo/n_face_iter.hh @@ -62,13 +62,9 @@ namespace mln class n_face_fwd_iter : public internal::complex_iter_base< face<D>, n_face_fwd_iter<D> > { - public: - /// Type of associated face. - typedef face<D> face; - private: typedef n_face_fwd_iter<D> self_; - typedef internal::complex_iter_base< face, self_ > super_; + typedef internal::complex_iter_base< face<D>, self_ > super_; public: using super_::is_valid; @@ -114,13 +110,9 @@ namespace mln class n_face_bkd_iter : public internal::complex_iter_base< face<D>, n_face_bkd_iter<D> > { - public: - /// Type of associated face. - typedef face<D> face; - private: typedef n_face_bkd_iter<D> self_; - typedef internal::complex_iter_base< face, self_ > super_; + typedef internal::complex_iter_base< face<D>, self_ > super_; public: using super_::is_valid; diff --git a/milena/mln/topo/static_n_face_iter.hh b/milena/mln/topo/static_n_face_iter.hh index 2146310..291b699 100644 --- a/milena/mln/topo/static_n_face_iter.hh +++ b/milena/mln/topo/static_n_face_iter.hh @@ -56,13 +56,9 @@ namespace mln : public internal::complex_iter_base< face<D>, static_n_face_fwd_iter<N, D> > { - public: - /// Type of associated face. - typedef face<D> face; - private: typedef static_n_face_fwd_iter<N, D> self_; - typedef internal::complex_iter_base< face, self_ > super_; + typedef internal::complex_iter_base< face<D>, self_ > super_; public: using super_::is_valid; @@ -103,13 +99,9 @@ namespace mln : public internal::complex_iter_base< face<D>, static_n_face_bkd_iter<N, D> > { - public: - /// Type of associated face. - typedef face<D> face; - private: typedef static_n_face_bkd_iter<N, D> self_; - typedef internal::complex_iter_base< face, self_ > super_; + typedef internal::complex_iter_base< face<D>, self_ > super_; public: using super_::is_valid; -- 1.5.6.5