* mln/topo/face.hh, mln/topo/n_face.hh (mln::face<D>::face(const face<D>&)) (mln::n_face<N, D>::n_face(const n_face<N, D>&)): Remove copy ctors. (mln::face<D>::operator=(const face<D>&)) (mln::n_face<N, D>::operator=(const n_face<N, D>&)): Remove assignment operators. --- milena/ChangeLog | 12 ++++++++++++ milena/mln/topo/face.hh | 28 ---------------------------- milena/mln/topo/n_face.hh | 29 ----------------------------- 3 files changed, 12 insertions(+), 57 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6269489..77d210c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2008-09-26 Roland Levillain <roland@lrde.epita.fr> + Remove useless copy ctors and assignment operators in face handles. + + * mln/topo/face.hh, mln/topo/n_face.hh + (mln::face<D>::face(const face<D>&)) + (mln::n_face<N, D>::n_face(const n_face<N, D>&)): + Remove copy ctors. + (mln::face<D>::operator=(const face<D>&)) + (mln::n_face<N, D>::operator=(const n_face<N, D>&)): + Remove assignment operators. + +2008-09-26 Roland Levillain <roland@lrde.epita.fr> + Adjust complex piters w.r.t. new names of iterators on complex faces. * mln/core/site_set/p_complex_piter.hh: diff --git a/milena/mln/topo/face.hh b/milena/mln/topo/face.hh index 136271c..b35f6c7 100644 --- a/milena/mln/topo/face.hh +++ b/milena/mln/topo/face.hh @@ -70,13 +70,6 @@ namespace mln template <unsigned N> face(const n_face<N, D>& f); - // FIXME: Probably useless. - /// Copy and assignment. - /// \{ - face(const face<D>& rhs); - face<D>& operator=(const face<D>& rhs); - /// \} - /// Is this handle valid? bool is_valid() const; /// Invalidate this handle. @@ -176,27 +169,6 @@ namespace mln template <unsigned D> inline - face<D>::face(const face<D>& rhs) - : cplx_(rhs.cplx_), n_(rhs.n_), face_id_(rhs.face_id_) - { - } - - template <unsigned D> - inline - face<D>& - face<D>::operator=(const face<D>& rhs) - { - if (&rhs != this) - { - cplx_ = rhs.cplx_; - n_ = rhs.n_; - face_id_ = rhs.face_id_; - } - return *this; - } - - template <unsigned D> - inline bool face<D>::is_valid() const { diff --git a/milena/mln/topo/n_face.hh b/milena/mln/topo/n_face.hh index afeb4ab..e243cc6 100644 --- a/milena/mln/topo/n_face.hh +++ b/milena/mln/topo/n_face.hh @@ -66,13 +66,6 @@ namespace mln /// Build a face handle from \a complex and \a face_id. n_face(complex<D>& complex, unsigned face_id); - // FIXME: Probably useless. - /// Copy and assignment. - /// \{ - n_face(const n_face<N, D>& rhs); - n_face<N, D>& operator=(const n_face<N, D>& rhs); - /// \} - /// Is this handle valid? bool is_valid() const; /// Invalidate this handle. @@ -160,28 +153,6 @@ namespace mln template <unsigned N, unsigned D> inline - n_face<N, D>::n_face(const n_face<N, D>& rhs) - : cplx_(rhs.cplx_), face_id_(rhs.face_id_) - { - // Ensure N is compatible with D. - metal::bool_< N <= D >::check(); - } - - template <unsigned N, unsigned D> - inline - n_face<N, D>& - n_face<N, D>::operator=(const n_face<N, D>& rhs) - { - if (&rhs != this) - { - cplx_ = rhs.cplx_; - face_id_ = rhs.face_id_; - } - return *this; - } - - template <unsigned N, unsigned D> - inline bool n_face<N, D>::is_valid() const { -- 1.6.0.1