[Olena-patches] 2454: Fix mln::topo::complex_psite<D, P> conversion to topo::face<D>.

* mln/core/site_set/complex_psite.hh (mln::topo::complex_psite<D, P>): Return a const reference to the held face instead of a copy, so that its address can be safely taken. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/site_set/complex_psite.hh | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e6ca427..641ceda 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-10-01 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Fix mln::topo::complex_psite<D, P> conversion to topo::face<D>. + + * mln/core/site_set/complex_psite.hh + (mln::topo::complex_psite<D, P>): Return a const reference to the + held face instead of a copy, so that its address can be safely + taken. + +2008-10-01 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Fix comparison operators on topo::face<D> and topo::n_face<N, D>. * mln/topo/face.hh diff --git a/milena/mln/core/site_set/complex_psite.hh b/milena/mln/core/site_set/complex_psite.hh index 02ab19e..fdff939 100644 --- a/milena/mln/core/site_set/complex_psite.hh +++ b/milena/mln/core/site_set/complex_psite.hh @@ -107,7 +107,7 @@ namespace mln /// Face handle manipulators. /// \{ /// Return the face handle of this point site. - topo::face<D> face() const; + const topo::face<D>& face() const; /// Return the dimension of the face of this psite. unsigned n() const; @@ -289,7 +289,7 @@ namespace mln template <unsigned D, typename P> inline - topo::face<D> + const topo::face<D>& complex_psite<D, P>::face() const { return face_; -- 1.6.0.1