[Olena-patches] olena-2.0-15-g6982d67 Fix compilation Warnings with latest g++ versions.

* apps/papers/levillain.09.ismm/graph.cc, * mln/canvas/browsing/diagonal2d.hh, * mln/morpho/watershed/topological.hh: Remove unused variable. * mln/canvas/labeling/sorted.hh, * mln/core/concept/accumulator.hh, * mln/core/concept/box.hh, * mln/core/concept/gdpoint.hh, * mln/core/concept/generalized_pixel.hh, * mln/core/concept/gpoint.hh, * mln/core/concept/graph.hh, * mln/core/concept/image.hh, * mln/core/concept/iterator.hh, * mln/core/concept/neighborhood.hh, * mln/core/concept/proxy.hh, * mln/core/concept/pseudo_site.hh, * mln/core/concept/site_iterator.hh, * mln/core/concept/site_proxy.hh, * mln/core/concept/site_set.hh, * mln/core/concept/value_iterator.hh, * mln/core/concept/value_set.hh, * mln/core/concept/weighted_window.hh, * mln/core/concept/window.hh, * mln/core/image/imorph/decorated_image.hh, * mln/core/internal/check/image_fastest.hh, * mln/core/internal/site_relative_iterator_base.hh, * mln/io/off/load.hh, * mln/io/off/save.hh, * mln/morpho/reconstruction/by_erosion/union_find.hh, * mln/topo/internal/complex_relative_iterator_base.hh, * tests/algebra/h_vec.cc, * tests/core/alias/point1d.cc, * tests/metal/unconst.cc, * tests/morpho/complex_image_wst.cc, * apps/papers/levillain.09.ismm/graph.cc, * mln/canvas/browsing/diagonal2d.hh, * mln/canvas/labeling/sorted.hh, * mln/core/concept/accumulator.hh, * mln/core/concept/box.hh, * mln/core/concept/gdpoint.hh, * mln/core/concept/generalized_pixel.hh, * mln/core/concept/gpoint.hh, * mln/core/concept/graph.hh, * mln/core/concept/image.hh, * mln/core/concept/iterator.hh, * mln/core/concept/neighborhood.hh, * mln/core/concept/proxy.hh, * mln/core/concept/pseudo_site.hh, * mln/core/concept/site_iterator.hh, * mln/core/concept/site_proxy.hh, * mln/core/concept/site_set.hh, * mln/core/concept/value_iterator.hh, * mln/core/concept/value_set.hh, * mln/core/concept/weighted_window.hh, * mln/core/concept/window.hh, * mln/core/image/imorph/decorated_image.hh, * mln/core/internal/check/image_fastest.hh, * mln/core/internal/site_relative_iterator_base.hh, * mln/io/off/load.hh, * mln/io/off/save.hh, * mln/morpho/reconstruction/by_erosion/union_find.hh, * mln/morpho/watershed/topological.hh, * mln/topo/internal/complex_relative_iterator_base.hh, * tests/algebra/h_vec.cc, * tests/core/alias/point1d.cc, * tests/metal/unconst.cc, * tests/morpho/complex_image_wst.cc, * tests/trait/super.cc: Fix unused variable warnings. --- milena/ChangeLog | 73 ++++++++++++++++++++ milena/apps/papers/levillain.09.ismm/graph.cc | 4 - milena/mln/canvas/browsing/diagonal2d.hh | 7 +- milena/mln/canvas/labeling/sorted.hh | 2 +- milena/mln/core/concept/accumulator.hh | 15 ++-- milena/mln/core/concept/box.hh | 7 +- milena/mln/core/concept/gdpoint.hh | 5 +- milena/mln/core/concept/generalized_pixel.hh | 9 ++- milena/mln/core/concept/gpoint.hh | 5 +- milena/mln/core/concept/graph.hh | 34 +++++----- milena/mln/core/concept/image.hh | 21 +++--- milena/mln/core/concept/iterator.hh | 11 ++-- milena/mln/core/concept/neighborhood.hh | 9 ++- milena/mln/core/concept/proxy.hh | 5 +- milena/mln/core/concept/pseudo_site.hh | 7 +- milena/mln/core/concept/site_iterator.hh | 15 ++-- milena/mln/core/concept/site_proxy.hh | 7 +- milena/mln/core/concept/site_set.hh | 23 +++--- milena/mln/core/concept/value_iterator.hh | 5 +- milena/mln/core/concept/value_set.hh | 8 +- milena/mln/core/concept/weighted_window.hh | 7 +- milena/mln/core/concept/window.hh | 25 ++++--- milena/mln/core/image/imorph/decorated_image.hh | 4 +- milena/mln/core/internal/check/image_fastest.hh | 21 +++--- .../core/internal/site_relative_iterator_base.hh | 10 ++-- milena/mln/io/off/load.hh | 9 ++- milena/mln/io/off/save.hh | 5 +- .../morpho/reconstruction/by_erosion/union_find.hh | 5 +- milena/mln/morpho/watershed/topological.hh | 4 +- .../internal/complex_relative_iterator_base.hh | 7 +- milena/tests/algebra/h_vec.cc | 1 + milena/tests/core/alias/point1d.cc | 4 +- milena/tests/metal/unconst.cc | 9 ++- milena/tests/morpho/complex_image_wst.cc | 2 + milena/tests/trait/super.cc | 1 + 35 files changed, 244 insertions(+), 142 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5ee2282..abe73a7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,76 @@ +2011-11-16 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix compilation Warnings with latest g++ versions. + + * apps/papers/levillain.09.ismm/graph.cc, + * mln/canvas/browsing/diagonal2d.hh, + * mln/morpho/watershed/topological.hh: Remove unused variable. + + * mln/canvas/labeling/sorted.hh, + * mln/core/concept/accumulator.hh, + * mln/core/concept/box.hh, + * mln/core/concept/gdpoint.hh, + * mln/core/concept/generalized_pixel.hh, + * mln/core/concept/gpoint.hh, + * mln/core/concept/graph.hh, + * mln/core/concept/image.hh, + * mln/core/concept/iterator.hh, + * mln/core/concept/neighborhood.hh, + * mln/core/concept/proxy.hh, + * mln/core/concept/pseudo_site.hh, + * mln/core/concept/site_iterator.hh, + * mln/core/concept/site_proxy.hh, + * mln/core/concept/site_set.hh, + * mln/core/concept/value_iterator.hh, + * mln/core/concept/value_set.hh, + * mln/core/concept/weighted_window.hh, + * mln/core/concept/window.hh, + * mln/core/image/imorph/decorated_image.hh, + * mln/core/internal/check/image_fastest.hh, + * mln/core/internal/site_relative_iterator_base.hh, + * mln/io/off/load.hh, + * mln/io/off/save.hh, + * mln/morpho/reconstruction/by_erosion/union_find.hh, + * mln/topo/internal/complex_relative_iterator_base.hh, + * tests/algebra/h_vec.cc, + * tests/core/alias/point1d.cc, + * tests/metal/unconst.cc, + * tests/morpho/complex_image_wst.cc, + * apps/papers/levillain.09.ismm/graph.cc, + * mln/canvas/browsing/diagonal2d.hh, + * mln/canvas/labeling/sorted.hh, + * mln/core/concept/accumulator.hh, + * mln/core/concept/box.hh, + * mln/core/concept/gdpoint.hh, + * mln/core/concept/generalized_pixel.hh, + * mln/core/concept/gpoint.hh, + * mln/core/concept/graph.hh, + * mln/core/concept/image.hh, + * mln/core/concept/iterator.hh, + * mln/core/concept/neighborhood.hh, + * mln/core/concept/proxy.hh, + * mln/core/concept/pseudo_site.hh, + * mln/core/concept/site_iterator.hh, + * mln/core/concept/site_proxy.hh, + * mln/core/concept/site_set.hh, + * mln/core/concept/value_iterator.hh, + * mln/core/concept/value_set.hh, + * mln/core/concept/weighted_window.hh, + * mln/core/concept/window.hh, + * mln/core/image/imorph/decorated_image.hh, + * mln/core/internal/check/image_fastest.hh, + * mln/core/internal/site_relative_iterator_base.hh, + * mln/io/off/load.hh, + * mln/io/off/save.hh, + * mln/morpho/reconstruction/by_erosion/union_find.hh, + * mln/morpho/watershed/topological.hh, + * mln/topo/internal/complex_relative_iterator_base.hh, + * tests/algebra/h_vec.cc, + * tests/core/alias/point1d.cc, + * tests/metal/unconst.cc, + * tests/morpho/complex_image_wst.cc, + * tests/trait/super.cc: Fix unused variable warnings. + 2011-10-28 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; * mln/core/image/dmorph/slice_image.hh: Add operator=() for diff --git a/milena/apps/papers/levillain.09.ismm/graph.cc b/milena/apps/papers/levillain.09.ismm/graph.cc index bd6f983..507bbc5 100644 --- a/milena/apps/papers/levillain.09.ismm/graph.cc +++ b/milena/apps/papers/levillain.09.ismm/graph.cc @@ -189,10 +189,8 @@ namespace mln // Adjacent vertices. adj_v.start(); topo::face<1> v1 = adj_v.unproxy_().face(); - point2d p1 = adj_v.to_site().front(); adj_v.next(); topo::face<1> v2 = adj_v.unproxy_().face(); - point2d p2 = adj_v.to_site().front(); adj_v.next(); mln_invariant(!adj_v.is_valid()); @@ -279,10 +277,8 @@ namespace mln // Adjacent vertices. adj_v.start(); topo::face<1> v1 = adj_v.unproxy_().face(); - point2d p1 = adj_v.to_site().front(); adj_v.next(); topo::face<1> v2 = adj_v.unproxy_().face(); - point2d p2 = adj_v.to_site().front(); adj_v.next(); mln_invariant(!adj_v.is_valid()); diff --git a/milena/mln/canvas/browsing/diagonal2d.hh b/milena/mln/canvas/browsing/diagonal2d.hh index 056375b..7840362 100644 --- a/milena/mln/canvas/browsing/diagonal2d.hh +++ b/milena/mln/canvas/browsing/diagonal2d.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -115,8 +115,7 @@ namespace mln mln_deduce(I, psite, delta) diag; psite - pmin = f.input.domain().pmin(), - pmax = f.input.domain().pmax(); + pmin = f.input.domain().pmin(); f.p = pmin; diff --git a/milena/mln/canvas/labeling/sorted.hh b/milena/mln/canvas/labeling/sorted.hh index 4f7dd5f..69f2181 100644 --- a/milena/mln/canvas/labeling/sorted.hh +++ b/milena/mln/canvas/labeling/sorted.hh @@ -96,7 +96,7 @@ namespace mln // Output. mln_ch_value(I, L) output; - bool status; + bool status; // FIXME: Is-it useful? // Initialization. { diff --git a/milena/mln/core/concept/accumulator.hh b/milena/mln/core/concept/accumulator.hh index fc39314..a28664e 100644 --- a/milena/mln/core/concept/accumulator.hh +++ b/milena/mln/core/concept/accumulator.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -162,19 +163,19 @@ namespace mln typedef mln_q_result(E) q_result; void (E::*m1)() = & E::init; - m1 = 0; + (void) m1; void (E::*m2)(const argument&) = & E::take; - m2 = 0; + (void) m2; void (E::*m3)(const E&) = & E::take; - m3 = 0; + (void) m3; q_result (E::*m4)() const = & E::to_result; - m4 = 0; + (void) m4; q_result (E::*m5)() const = & E::operator q_result; - m5 = 0; + (void) m5; bool (E::*m6)() const = & E::is_valid; - m6 = 0; + (void) m6; } diff --git a/milena/mln/core/concept/box.hh b/milena/mln/core/concept/box.hh index 15696b4..849a8e4 100644 --- a/milena/mln/core/concept/box.hh +++ b/milena/mln/core/concept/box.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -142,9 +143,9 @@ namespace mln { typedef mln_site(E) site; site (E::*m1)() const = & E::pmin; - m1 = 0; + (void) m1; site (E::*m2)() const = & E::pmax; - m2 = 0; + (void) m2; } template <typename E> diff --git a/milena/mln/core/concept/gdpoint.hh b/milena/mln/core/concept/gdpoint.hh index c5b0bbd..722db89 100644 --- a/milena/mln/core/concept/gdpoint.hh +++ b/milena/mln/core/concept/gdpoint.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -166,7 +167,7 @@ namespace mln typedef mln_grid(E) grid; typedef mln_vec(E) vec; vec (E::*m)() const = & E::to_vec; - m = 0; + (void) m; } diff --git a/milena/mln/core/concept/generalized_pixel.hh b/milena/mln/core/concept/generalized_pixel.hh index 7b3bb6e..ff9faf0 100644 --- a/milena/mln/core/concept/generalized_pixel.hh +++ b/milena/mln/core/concept/generalized_pixel.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -83,15 +84,15 @@ namespace mln typedef mln_rvalue(E) rvalue; rvalue (E::*m1)() const = & E::val; - m1 = 0; + (void) m1; typedef mln_image(E) image; // FIXME: check "without &" image& (E::*m2)() const = & E::ima; - m2 = 0; + (void) m2; mln_qlf_value(image)** (E::*m3)() const = & E::address_; - m3 = 0; + (void ) m3; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/core/concept/gpoint.hh b/milena/mln/core/concept/gpoint.hh index f9bba11..410b36a 100644 --- a/milena/mln/core/concept/gpoint.hh +++ b/milena/mln/core/concept/gpoint.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -302,7 +303,7 @@ namespace mln typedef mln_delta(E) delta; typedef mln_vec(E) vec; vec (E::*m)() const = & E::to_vec; - m = 0; + (void) m; } diff --git a/milena/mln/core/concept/graph.hh b/milena/mln/core/concept/graph.hh index c351f9c..a266783 100644 --- a/milena/mln/core/concept/graph.hh +++ b/milena/mln/core/concept/graph.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -113,38 +113,38 @@ namespace mln // Check methods const void* (E::*m1)() const = & E::id; - m1 = 0; + (void) m1; util::vertex_id_t (E::*m2)(const util::edge_id_t& id_e, const util::vertex_id_t& id_v) const = & E::v_other; - m2 = 0; + (void) m2; size_t (E::*m4)() const = & E::v_nmax; - m4 = 0; + (void) m4; bool (E::*m5)(const util::vertex_id_t& id_v) const = & E::has_v; - m5 = 0; + (void) m5; size_t (E::*m6)(const util::vertex_id_t& id_v) const = & E::v_nmax_nbh_edges; - m6 = 0; + (void) m6; util::edge_id_t (E::*m7)(const util::vertex_id_t& id_v, unsigned i) const = & E::v_ith_nbh_edge; - m7 = 0; + (void) m7; size_t (E::*m8)() const = & E::e_nmax; - m8 = 0; + (void) m8; bool (E::*m9)(const util::edge_id_t& id_e) const = & E::has_e; - m9 = 0; + (void) m9; util::vertex_id_t (E::*m10)(const util::edge_id_t& id_e) const = & E::v1; - m10 = 0; + (void) m10; util::vertex_id_t (E::*m11)(const util::edge_id_t& id_e) const = & E::v2; - m11 = 0; + (void) m11; size_t (E::*m12)(const util::edge_id_t& id_e) const = & E::e_nmax_nbh_edges; - m12 = 0; + (void) m12; util::edge_id_t (E::*m13)(const util::edge_id_t& id_e, unsigned i) const = & E::e_ith_nbh_edge; - m13 = 0; + (void) m13; bool (E::*m14)() const = & E::is_valid; - m14 = 0; + (void) m14; void (E::*m15)() = & E::invalidate; - m15 = 0; + (void) m15; //FIXME: enable this test. Currently does not work because this is // a templated method. //bool (E::*m14)(...) = & E::is_subgraph_of; - //m14 = 0; + //(void) m14; } diff --git a/milena/mln/core/concept/image.hh b/milena/mln/core/concept/image.hh index 8c620bc..4c70768 100644 --- a/milena/mln/core/concept/image.hh +++ b/milena/mln/core/concept/image.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -216,24 +216,24 @@ namespace mln typedef mln_bkd_piter(E) bkd_piter; bool (E::*m1)(const psite& p) const = & E::has; - m1 = 0; + (void) m1; // Only some image types feature the 'nsites' method. // unsigned (E::*m2)() const = & E::nsites; -// m2 = 0; +// (void) m2; bool (E::*m3)() const = & E::is_valid; - m3 = 0; + (void) m3; typedef typename E::t_eligible_values_set t_eligible_values_set; const t_eligible_values_set& (E::*m4)() const = & E::values_eligible; - m4 = 0; + (void) m4; typedef typename E::t_values_space t_values_space; const t_values_space& (E::*m5)() const = & E::values_space; - m5 = 0; + (void) m5; // to be provided in concrete image classes: @@ -246,15 +246,16 @@ namespace mln // FIXME Doc //typedef mln_vset(E) vset; //const vset& (E::*m5)() const = & E::values; - //m5 = 0; + //(void) m5; rvalue (E::*m6)(const psite& p) const = & E::operator(); - m6 = 0; + (void) m6; + lvalue (E::*m7)(const psite& p) = & E::operator(); - m7 = 0; + (void) m7; const domain_t& (E::*m8)() const = & E::domain; - m8 = 0; + (void) m8; typedef typename E::skeleton skeleton; diff --git a/milena/mln/core/concept/iterator.hh b/milena/mln/core/concept/iterator.hh index 0da1ac8..5d0b090 100644 --- a/milena/mln/core/concept/iterator.hh +++ b/milena/mln/core/concept/iterator.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -110,13 +111,13 @@ namespace mln Iterator<E>::Iterator() { bool (E::*m1)() const = & E::is_valid; - m1 = 0; + (void) m1; void (E::*m2)() = & E::invalidate; - m2 = 0; + (void) m2; void (E::*m3)() = & E::start; - m3 = 0; + (void) m3; void (E::*m4)() = & E::next_; - m4 = 0; + (void) m4; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/core/concept/neighborhood.hh b/milena/mln/core/concept/neighborhood.hh index 2cd01ac..3fa0521 100644 --- a/milena/mln/core/concept/neighborhood.hh +++ b/milena/mln/core/concept/neighborhood.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -121,16 +122,16 @@ namespace mln typedef mln_window(E) window; bool m = (& E::win) == (& E::win); - m = 0; + (void) m; bool (E::*m2)() const = &E::is_valid; - m2 = 0; + (void) m2; # if 0 /* FIXME: Disabled, as win() can either return a const reference or a copy of the window (see documentation above). Hence the simpler, relaxed check above (m0). */ const window& (E::*m1)() const = & E::win; - m = m1; + (void) m1; # endif } diff --git a/milena/mln/core/concept/proxy.hh b/milena/mln/core/concept/proxy.hh index f8cd9b4..f22f342 100644 --- a/milena/mln/core/concept/proxy.hh +++ b/milena/mln/core/concept/proxy.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -331,7 +332,7 @@ namespace mln typedef typename E::q_subject q_subject; q_subject (E::*m_)() = & E::subj_; - m_ = 0; + (void) m_; } diff --git a/milena/mln/core/concept/pseudo_site.hh b/milena/mln/core/concept/pseudo_site.hh index e8e5b03..b550baf 100644 --- a/milena/mln/core/concept/pseudo_site.hh +++ b/milena/mln/core/concept/pseudo_site.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -98,9 +99,9 @@ namespace mln typedef mln_target(E) target; void (E::*m1)(const target&) = & E::change_target; - m1 = 0; + (void) m1; const target* (E::*m2)() const = & E::target_; - m2 = 0; + (void) m2; } template <typename E> diff --git a/milena/mln/core/concept/site_iterator.hh b/milena/mln/core/concept/site_iterator.hh index 4a8f7fe..7ef6a43 100644 --- a/milena/mln/core/concept/site_iterator.hh +++ b/milena/mln/core/concept/site_iterator.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -131,17 +132,17 @@ namespace mln Site_Iterator<E>::Site_Iterator() { bool m0 = (& E::target_) == (& E::target_); // FIXME: Find a better test. - m0 = 0; + (void) m0; bool (E::*m1)() const = & E::is_valid_; - m1 = 0; + (void) m1; void (E::*m2)() = & E::invalidate_; - m2 = 0; + (void) m2; void (E::*m3)() = & E::start_; - m3 = 0; + (void) m3; void (E::*m4)() = & E::next_; - m4 = 0; + (void) m4; bool m5 = (& E::change_target) == (& E::change_target); - m5 = 0; + (void) m5; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/core/concept/site_proxy.hh b/milena/mln/core/concept/site_proxy.hh index d63c1eb..2d964e7 100644 --- a/milena/mln/core/concept/site_proxy.hh +++ b/milena/mln/core/concept/site_proxy.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -82,11 +83,11 @@ namespace mln typedef mln_site(E) site; const site& (E::*m1)() const = & E::to_site; - m1 = 0; + (void) m1; // De-activate because sometimes it returns a "const site&"... // site (E::*m2)() const = & E::operator site; -// m2 = 0; +// (void) m2; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/core/concept/site_set.hh b/milena/mln/core/concept/site_set.hh index f0f2864..bbf217c 100644 --- a/milena/mln/core/concept/site_set.hh +++ b/milena/mln/core/concept/site_set.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -185,7 +186,7 @@ namespace mln static void run() { unsigned (E::*m)() const = & E::nsites; - m = 0; + (void) m; } }; @@ -198,7 +199,7 @@ namespace mln { typedef typename E::q_box q_box; q_box (E::*m)() const = & E::bbox; - m = 0; + (void) m; } }; @@ -227,9 +228,9 @@ namespace mln typedef typename E::i_element i_element; mlc_equal(mlc_unqualif(i_element), i_element)::check(); void (E::*m1)(const i_element&) = & E::insert; - m1 = 0; + (void) m1; void (E::*m2)() = & E::clear; - m2 = 0; + (void) m2; } }; @@ -241,13 +242,13 @@ namespace mln typedef typename E::i_element i_element; mlc_equal(mlc_unqualif(i_element), i_element)::check(); void (E::*m1)(const i_element&) = & E::insert; - m1 = 0; + (void) m1; typedef typename E::r_element r_element; mlc_equal(mlc_unqualif(r_element), r_element)::check(); void (E::*m2)(const r_element&) = & E::remove; - m2 = 0; + (void) m2; void (E::*m3)() = & E::clear; - m3 = 0; + (void) m3; } }; @@ -280,11 +281,11 @@ namespace mln // Check methods. bool (E::*m1)(const psite& p) const = & E::has; - m1 = 0; + (void) m1; bool (E::*m2)() const = & E::is_valid; - m2 = 0; + (void) m2; std::size_t (E::*m3)() const = & E::memory_size; - m3 = 0; + (void) m3; // Check methods depending upon properties. internal::site_set_nsites_check < mln_trait_site_set_nsites(E), E >::run(); diff --git a/milena/mln/core/concept/value_iterator.hh b/milena/mln/core/concept/value_iterator.hh index d87437e..1daccd7 100644 --- a/milena/mln/core/concept/value_iterator.hh +++ b/milena/mln/core/concept/value_iterator.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -84,7 +85,7 @@ namespace mln { typedef mln_value(E) value; value (E::*m)() const = & E::operator value; - m = 0; + (void) m; } template <typename E> diff --git a/milena/mln/core/concept/value_set.hh b/milena/mln/core/concept/value_set.hh index b047ab0..0976537 100644 --- a/milena/mln/core/concept/value_set.hh +++ b/milena/mln/core/concept/value_set.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2009, 2010 EPITA Research and Development +// Copyright (C) 2007, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -91,11 +91,11 @@ namespace mln typedef mln_bkd_viter(E) bkd_viter; bool (E::*m1)(const value&) const = & E::has; - m1 = 0; + (void) m1; value (E::*m2)(unsigned) const = & E::operator[]; - m2 = 0; + (void) m2; unsigned (E::*m3)() const = & E::nvalues; - m3 = 0; + (void) m3; } template <typename E> diff --git a/milena/mln/core/concept/weighted_window.hh b/milena/mln/core/concept/weighted_window.hh index cdc5ce5..1341860 100644 --- a/milena/mln/core/concept/weighted_window.hh +++ b/milena/mln/core/concept/weighted_window.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -113,10 +114,10 @@ namespace mln typedef mln_bkd_qiter(E) bkd_qiter; void (E::*m1)() = & E::sym; - m1 = 0; + (void) m1; const window& (E::*m2)() const = & E::win; - m2 = 0; + (void) m2; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/core/concept/window.hh b/milena/mln/core/concept/window.hh index cde8550..3b2eafb 100644 --- a/milena/mln/core/concept/window.hh +++ b/milena/mln/core/concept/window.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -161,7 +162,7 @@ namespace mln static void run() { unsigned (E::*m)() const = & E::size; - m = 0; + (void) m; } }; @@ -183,24 +184,24 @@ namespace mln // Methods. bool (E::*m1)() const = &E::is_centered; - m1 = 0; + (void) m1; bool (E::*m2)() const = &E::is_symmetric; - m2 = 0; + (void) m2; void (E::*m3)() = &E::sym; - m3 = 0; + (void) m3; unsigned (E::*m4)() const = &E::delta; - m4 = 0; + (void) m4; bool (E::*m5)() const = &E::is_valid; - m5 = 0; + (void) m5; } static void run(mln::trait::window::definition::unique) { typedef mln_dpsite(E) D; const D& (E::*m1)(unsigned) const = &E::dp; - m1 = 0; + (void) m1; bool (E::*m2)(const D&) const = &E::has; - m2 = 0; + (void) m2; run_extra(); } @@ -235,11 +236,11 @@ namespace mln { typedef mln_element(E) W; void (E::*m1)(unsigned, const W&) = &E::set_window; - m1 = 0; + (void) m1; const W& (E::*m2)(unsigned) const = &E::window; - m2 = 0; + (void) m2; unsigned (E::*m3)() const = &E::nwindows; - m3 = 0; + (void) m3; } }; diff --git a/milena/mln/core/image/imorph/decorated_image.hh b/milena/mln/core/image/imorph/decorated_image.hh index 181cbcd..54acbc7 100644 --- a/milena/mln/core/image/imorph/decorated_image.hh +++ b/milena/mln/core/image/imorph/decorated_image.hh @@ -184,11 +184,11 @@ namespace mln decorated_image<I,D>::~decorated_image() { void (D::*mr)(const I&, const mln_psite(I)&) const = & D::reading; - mr = 0; + (void) mr; typedef mlc_unconst(I) I_; void (D::*mw)(I_&, const mln_psite(I_)&, const mln_value(I_)&) = & D::writing; - mw = 0; + (void) mw; } template <typename I, typename D> diff --git a/milena/mln/core/internal/check/image_fastest.hh b/milena/mln/core/internal/check/image_fastest.hh index cdff19f..9aa7c51 100644 --- a/milena/mln/core/internal/check/image_fastest.hh +++ b/milena/mln/core/internal/check/image_fastest.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -94,33 +95,33 @@ namespace mln typedef mln_bkd_pixter(E) bkd_pixter; int (E::*m1)(const dpsite&) const = & E::delta_index; - m1 = 0; + (void) m1; site (E::*m2)(unsigned) const = & E::point_at_index; - m2 = 0; + (void) m2; unsigned (E::*m3)() const = & E::border; - m3 = 0; + (void) m3; typedef mln_value(E) value; mln_qlf_value(E)* (E::*m4)() = & E::buffer; - m4 = 0; + (void) m4; const value* (E::*m5)() const = & E::buffer; - m5 = 0; + (void) m5; typedef mln_rvalue(E) rvalue; typedef mln_lvalue(E) lvalue; rvalue (E::*m6)(unsigned) const = & E::element; - m6 = 0; + (void) m6; lvalue (E::*m7)(unsigned) = & E::element; - m7 = 0; + (void) m7; unsigned (E::*m8)() const = & E::nelements; - m8 = 0; + (void) m8; # if (defined(__GNUC__) && __GNUC__ >= 3) && !defined(__INTEL_COMPILER) unsigned (E::*m9)(const psite& p) const = & E::index_of_point; - m9 = 0; + (void) m9; # endif // FIXME: how to check that qixter are defined when W is unknown! diff --git a/milena/mln/core/internal/site_relative_iterator_base.hh b/milena/mln/core/internal/site_relative_iterator_base.hh index 4d9567f..7483dfa 100644 --- a/milena/mln/core/internal/site_relative_iterator_base.hh +++ b/milena/mln/core/internal/site_relative_iterator_base.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -128,11 +128,11 @@ namespace mln : c_(0) { void (E::*m1)() = & E::do_start_; - m1 = 0; + (void) m1; void (E::*m2)() = & E::do_next_; - m2 = 0; + (void) m2; mln_psite(S) (E::*m3)() const = & E::compute_p_; - m3 = 0; + (void) m3; } template <typename S, typename E, typename C> diff --git a/milena/mln/io/off/load.hh b/milena/mln/io/off/load.hh index c9c4af7..9996df7 100644 --- a/milena/mln/io/off/load.hh +++ b/milena/mln/io/off/load.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -218,11 +219,11 @@ namespace mln { // Concept checking. void (E::*m1)(std::istream&) = &E::read_face_data; - m1 = 0; + (void) m1; void (E::*m2)(unsigned, unsigned, unsigned) = &E::reserve; - m2 = 0; + (void) m2; void (E::*m3)(values&, const domain&) = &E::assign; - m3 = 0; + (void) m3; } diff --git a/milena/mln/io/off/save.hh b/milena/mln/io/off/save.hh index 1ec747d..dba5fa7 100644 --- a/milena/mln/io/off/save.hh +++ b/milena/mln/io/off/save.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -211,7 +212,7 @@ namespace mln // Concept checking. void (E::*m1)(std::ostream&, const value&) const = &E::write_face_data; - m1 = 0; + (void) m1; } diff --git a/milena/mln/morpho/reconstruction/by_erosion/union_find.hh b/milena/mln/morpho/reconstruction/by_erosion/union_find.hh index ebce224..b367f7b 100644 --- a/milena/mln/morpho/reconstruction/by_erosion/union_find.hh +++ b/milena/mln/morpho/reconstruction/by_erosion/union_find.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -224,6 +224,7 @@ namespace mln const Neighborhood<N>& nbh) { // FIXME: Not yet implemented. + (void) nbh; std::cerr << __FILE__ << ":" << __LINE__ << ": error:\n" "mln::morpho::reconstruction::by_erosion::internal::\n" diff --git a/milena/mln/morpho/watershed/topological.hh b/milena/mln/morpho/watershed/topological.hh index b06e6ab..20702e3 100644 --- a/milena/mln/morpho/watershed/topological.hh +++ b/milena/mln/morpho/watershed/topological.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -692,7 +693,6 @@ namespace mln p_priority< mln_value(I), p_queue_fast<mln_site(I)> > l; // p_queue < site > m; std::queue<mln_site(I)> m; - mln_value(I) min = mln_min(mln_value(I)); std::cout << "Init" << std::endl; diff --git a/milena/mln/topo/internal/complex_relative_iterator_base.hh b/milena/mln/topo/internal/complex_relative_iterator_base.hh index 58d6ee0..03f9cda 100644 --- a/milena/mln/topo/internal/complex_relative_iterator_base.hh +++ b/milena/mln/topo/internal/complex_relative_iterator_base.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -239,7 +240,7 @@ namespace mln { // Check for required methods in E. void (E::*m)() = & E::update_adj_faces_; - m = 0; + (void) m; exact(this)->invalidate(); } @@ -251,7 +252,7 @@ namespace mln { // Check for required methods in E. void (E::*m)() = & E::update_adj_faces_; - m = 0; + (void) m; center_at(f_ref); } diff --git a/milena/tests/algebra/h_vec.cc b/milena/tests/algebra/h_vec.cc index 8b833c5..d674d58 100644 --- a/milena/tests/algebra/h_vec.cc +++ b/milena/tests/algebra/h_vec.cc @@ -48,6 +48,7 @@ int main() algebra::vec<3, def::coord> x; algebra::h_vec<3, def::coord> w = x.to_h_vec(); + (void) w; typedef algebra::h_vec<3, def::coord> p3d; p3d p; diff --git a/milena/tests/core/alias/point1d.cc b/milena/tests/core/alias/point1d.cc index 1326ddd..627af52 100644 --- a/milena/tests/core/alias/point1d.cc +++ b/milena/tests/core/alias/point1d.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -37,6 +38,7 @@ int main() p[0] = 4; algebra::vec<1,float> v = p; + (void) v; p.ind() += 1; mln_assertion(p.ind() == 5 && p[0] == 5); diff --git a/milena/tests/metal/unconst.cc b/milena/tests/metal/unconst.cc index c199919..f2c0994 100644 --- a/milena/tests/metal/unconst.cc +++ b/milena/tests/metal/unconst.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -38,32 +39,38 @@ int main() { mlc_unconst_(int) var; // int var = 0; + (void) var; // void* v = var; } { mlc_unconst_(const int) var; // int var = 0; + (void) var; // void* v = var; } { mlc_unconst_(int*) var; // int* var = 0; + (void) var; // void v = var; } { mlc_unconst_(const int*) var; // const int* var = 0; + (void) var; // void v = var; } { mlc_unconst_(int *const) var; // int* var = 0; + (void) var; // void v = var; } { mlc_unconst_(const int *const) var; // const int* var = 0; + (void) var; // void v = var; } diff --git a/milena/tests/morpho/complex_image_wst.cc b/milena/tests/morpho/complex_image_wst.cc index 843b9dd..d39ae7b 100644 --- a/milena/tests/morpho/complex_image_wst.cc +++ b/milena/tests/morpho/complex_image_wst.cc @@ -297,9 +297,11 @@ int main() v.start(); topo::face<1> v1 = v.unproxy_().face(); point2d p1 = v.to_site().front(); + (void) p1; v.next(); topo::face<1> v2 = v.unproxy_().face(); point2d p2 = v.to_site().front(); + (void) p2; v.next(); mln_invariant(!v.is_valid()); diff --git a/milena/tests/trait/super.cc b/milena/tests/trait/super.cc index 33fdf2b..4e64604 100644 --- a/milena/tests/trait/super.cc +++ b/milena/tests/trait/super.cc @@ -134,6 +134,7 @@ int main() mln_trait_op_uminus_(my::test) tmp; tmp = true; + (void) tmp; // int i; // my::foo<int>(i); -- 1.7.2.5