* apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc: Here, as suggested by g++ 4.7. --- milena/ChangeLog | 8 ++++++++ milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc | 2 +- milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cf5d053..3a3a087 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2013-09-02 Roland Levillain <roland@lrde.epita.fr> + Add parentheses around complex operands of operator `|'. + + * apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc: + Here, as suggested by g++ 4.7. + +2013-09-02 Roland Levillain <roland@lrde.epita.fr> + Do not run test-mixed in Milena apps with the `check' target. * apps/generic-skel/test-mixed.in, diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc index 9e04285..5271d8b 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc @@ -237,7 +237,7 @@ main(int argc, char* argv[]) // Set non minima triangles to true; mln::data::fill ((surface | - mln::pw::value(minima) == mln::pw::cst(mln::literal::zero)).rw(), + (mln::pw::value(minima) == mln::pw::cst(mln::literal::zero))).rw(), true); // Extend non minima values from triangles to edges. mln::data::paste (mln::morpho::dilation(mln::extend(surface | is_an_edge, diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc index 4bdd51c..66ee9f9 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc @@ -237,7 +237,7 @@ main(int argc, char* argv[]) // Set non minima triangles to true; mln::data::fill ((surface | - mln::pw::value(minima) == mln::pw::cst(mln::literal::zero)).rw(), + (mln::pw::value(minima) == mln::pw::cst(mln::literal::zero))).rw(), true); // Extend non minima values from triangles to edges. mln::data::paste (mln::morpho::dilation(mln::extend(surface | is_an_edge, -- 1.7.10.4