* apps/graph-morpho/morpho.hh (trait::graph< mln::complex_image<1, G, V> >::is_vertex) (trait::graph< mln::complex_image<1, G, V> >::is_edge): Fix the return type. --- milena/ChangeLog | 9 +++++++++ milena/apps/graph-morpho/morpho.hh | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c34431a..f567ea8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2011-04-12 Roland Levillain <roland@lrde.epita.fr> + + apps/graph-morpho: Catch up with current mln::topo::is_n_face. + + * apps/graph-morpho/morpho.hh + (trait::graph< mln::complex_image<1, G, V> >::is_vertex) + (trait::graph< mln::complex_image<1, G, V> >::is_edge): + Fix the return type. + 2011-03-20 Roland Levillain <roland@lrde.epita.fr> Use priority-driven thinning in collapse-based thinnings apps. diff --git a/milena/apps/graph-morpho/morpho.hh b/milena/apps/graph-morpho/morpho.hh index bcdcdd9..734ee6c 100644 --- a/milena/apps/graph-morpho/morpho.hh +++ b/milena/apps/graph-morpho/morpho.hh @@ -134,17 +134,17 @@ namespace trait { // Return a functor saying whether a psite is a vertex or not. static - const mln::topo::is_n_face<0>& is_vertex() + const mln::topo::is_n_face<mln::complex_psite<1, G>, 0>& is_vertex() { - static mln::topo::is_n_face<0> is_vertex_fun; + static mln::topo::is_n_face<mln::complex_psite<1, G>, 0> is_vertex_fun; return is_vertex_fun; } // Return a functor saying whether a psite is a vertex or not. static - const mln::topo::is_n_face<1>& is_edge() + const mln::topo::is_n_face<mln::complex_psite<1, G>, 1>& is_edge() { - static mln::topo::is_n_face<1> is_edge_fun; + static mln::topo::is_n_face<mln::complex_psite<1, G>, 1> is_edge_fun; return is_edge_fun; } -- 1.5.6.5