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

* mln/topo/face.hh (mln::topo::face<D>::face_data): Rename method as... (mln::topo::face<D>::data): ...this. * mln/topo/n_face.hh (mln::topo::n_face<N, D>::face_data): Rename method as... (mln::topo::n_face<N, D>::data): ...this. * mln/topo/complex.hh (mln::topo::complex<D>::connect_): Adjust. * tests/topo/complex.cc: Adjust. --- milena/ChangeLog | 13 +++++++++++++ milena/mln/topo/complex.hh | 4 ++-- milena/mln/topo/face.hh | 4 ++-- milena/mln/topo/n_face.hh | 4 ++-- milena/tests/topo/complex.cc | 4 ++-- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 19eda01..8f404c2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2008-09-29 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Help the compiler not to mix up classes and methods. + + * mln/topo/face.hh (mln::topo::face<D>::face_data): + Rename method as... + (mln::topo::face<D>::data): ...this. + * mln/topo/n_face.hh (mln::topo::n_face<N, D>::face_data): + Rename method as... + (mln::topo::n_face<N, D>::data): ...this. + * mln/topo/complex.hh (mln::topo::complex<D>::connect_): Adjust. + * tests/topo/complex.cc: Adjust. + +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, diff --git a/milena/mln/topo/complex.hh b/milena/mln/topo/complex.hh index 13e21d0..c16ec9b 100644 --- a/milena/mln/topo/complex.hh +++ b/milena/mln/topo/complex.hh @@ -572,8 +572,8 @@ namespace mln // Ensure N is compatible with D. metal::bool_< N <= D >::check(); - f1.face_data().connect_higher_dim_face(f2); - f2.face_data().connect_lower_dim_face(f1); + f1.data().connect_higher_dim_face(f2); + f2.data().connect_lower_dim_face(f1); } diff --git a/milena/mln/topo/face.hh b/milena/mln/topo/face.hh index b35f6c7..b2d82b1 100644 --- a/milena/mln/topo/face.hh +++ b/milena/mln/topo/face.hh @@ -95,7 +95,7 @@ namespace mln /// Return the mln::topo::face_data pointed by this handle. template <unsigned N> - face_data<N, D>& face_data() const; + face_data<N, D>& data() const; /// \} private: @@ -237,7 +237,7 @@ namespace mln template <unsigned N> inline face_data<N, D>& - face<D>::face_data() const + face<D>::data() const { mln_precondition(n_ == N); mln_precondition(is_valid()); diff --git a/milena/mln/topo/n_face.hh b/milena/mln/topo/n_face.hh index e243cc6..8d9664b 100644 --- a/milena/mln/topo/n_face.hh +++ b/milena/mln/topo/n_face.hh @@ -88,7 +88,7 @@ namespace mln void set_face_id(unsigned face_id); /// Return the mln::topo::face_data pointed by this handle. - face_data<N, D>& face_data() const; + face_data<N, D>& data() const; /// \} private: @@ -211,7 +211,7 @@ namespace mln template <unsigned N, unsigned D> inline face_data<N, D>& - n_face<N, D>::face_data() const + n_face<N, D>::data() const { mln_precondition(is_valid()); return cplx_->template face_data_<N>(face_id_); diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index 59d6047..782bf97 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -112,12 +112,12 @@ int main() `-------------------*/ // Get the face data from (``static'') face handle E0. - const topo::face_data<1, D>& face1 = e0.face_data(); + const topo::face_data<1, D>& face1 = e0.data(); // Any-face handle. topo::face<D> af(e0); // Get the face data from (``dynamic'') face handle AF. - const topo::face_data<1, D>& face2 = af.face_data<1>(); + const topo::face_data<1, D>& face2 = af.data<1>(); mln_assertion(&face1 == &face2); -- 1.5.6.5