[Olena-patches] 2141: Follow g++ 4.3 advice w.r.t. nested `if' statements.

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Follow g++ 4.3 advice w.r.t. nested `if' statements. * mln/canvas/labeling.hh (mln::canvas::labeling<F>::pass_1()) * mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst<I, N, L>): Add braces around inner `if' to avoid (visual) ambiguity w.r.t. a dangling `else'. canvas/labeling.hh | 2 ++ morpho/meyer_wst.hh | 2 ++ 2 files changed, 4 insertions(+) Index: mln/morpho/meyer_wst.hh --- mln/morpho/meyer_wst.hh (revision 2140) +++ mln/morpho/meyer_wst.hh (working copy) @@ -155,6 +155,7 @@ mln_niter(N) n(nbh, p); for_all(n) if (output.has(n) && output(n) != unmarked) + { if (adjacent_marker == unmarked) { adjacent_marker = output(n); @@ -166,6 +167,7 @@ single_adjacent_marker_p = false; break; } + } /* If the neighborhood of P contains only psites with the same label, then P is marked with this label, and its neighbors that are not yet marked are put into the Index: mln/canvas/labeling.hh --- mln/canvas/labeling.hh (revision 2140) +++ mln/canvas/labeling.hh (working copy) @@ -174,10 +174,12 @@ make_set(p); for_all(n) if (f.input.has(n) && deja_vu(n)) + { if (f.equiv(n, p)) do_union(n, p); else f.do_no_union(n, p); + } deja_vu(p) = true; } }