[Olena-patches] 3948: Improve g++-2.95 compatibility.

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Improve g++-2.95 compatibility. * garrigues/fllt/test_fllt10.cc, * garrigues/fllt/test_fllt12.cc, * garrigues/fllt/test_fllt10_inv.cc, * garrigues/fllt/test_fllt7.cc, * garrigues/fllt/test_fllt9.cc, * garrigues/fllt/test_flltb.cc, * garrigues/fllt/test_fllt7_inv.cc, * garrigues/fllt/test_fllt13.cc, * garrigues/fllt/test_fllt15.cc, * garrigues/fllt/test_fllt8.cc (using): Remove useless typename. That makes files compile with g++-2.95. * inim/2009/binarization/binarization.hh (mln_concrete_ch_value): Replace by... (mln_ch_value): ...this. garrigues/fllt/test_fllt10.cc | 2 +- garrigues/fllt/test_fllt10_inv.cc | 2 +- garrigues/fllt/test_fllt12.cc | 2 +- garrigues/fllt/test_fllt13.cc | 2 +- garrigues/fllt/test_fllt15.cc | 2 +- garrigues/fllt/test_fllt7.cc | 2 +- garrigues/fllt/test_fllt7_inv.cc | 2 +- garrigues/fllt/test_fllt8.cc | 2 +- garrigues/fllt/test_fllt9.cc | 2 +- garrigues/fllt/test_flltb.cc | 2 +- inim/2009/binarization/binarization.hh | 10 +++++----- 11 files changed, 15 insertions(+), 15 deletions(-) Index: garrigues/fllt/test_fllt10.cc --- garrigues/fllt/test_fllt10.cc (revision 3947) +++ garrigues/fllt/test_fllt10.cc (working copy) @@ -17,7 +17,7 @@ { using namespace mln; - using typename value::int_u8; + using value::int_u8; int vs[5][10] = { {3, 3, 3, 3, 3, 4, 4, 4, 4, 4}, {3, 4, 4, 4, 3, 4, 3, 3, 3, 4}, Index: garrigues/fllt/test_fllt12.cc --- garrigues/fllt/test_fllt12.cc (revision 3947) +++ garrigues/fllt/test_fllt12.cc (working copy) @@ -17,7 +17,7 @@ { using namespace mln; - using typename value::int_u8; + using value::int_u8; int vs[4][5] = { {4, 4, 2, 2, 2}, {4, 3, 1, 2, 2}, Index: garrigues/fllt/test_fllt10_inv.cc --- garrigues/fllt/test_fllt10_inv.cc (revision 3947) +++ garrigues/fllt/test_fllt10_inv.cc (working copy) @@ -17,7 +17,7 @@ { using namespace mln; - using typename value::int_u8; + using value::int_u8; int vs[5][10] = { {0, 0, 0, 0, 0, 1, 1, 1, 1, 1}, {0, 1, 1, 1, 0, 1, 0, 0, 0, 1}, Index: garrigues/fllt/test_fllt7.cc --- garrigues/fllt/test_fllt7.cc (revision 3947) +++ garrigues/fllt/test_fllt7.cc (working copy) @@ -17,7 +17,7 @@ { using namespace mln; - using typename value::int_u8; + using value::int_u8; int ws[49] = {101, 101, 101, 191, 204, 255, 191, 101, 101, 191, 204, 204, 204, 204, Index: garrigues/fllt/test_fllt9.cc --- garrigues/fllt/test_fllt9.cc (revision 3947) +++ garrigues/fllt/test_fllt9.cc (working copy) @@ -17,7 +17,7 @@ { using namespace mln; - using typename value::int_u8; + using value::int_u8; int vs[5][5] = { {100, 100, 100, 100, 100}, {100, 200, 255, 200, 100}, Index: garrigues/fllt/test_flltb.cc --- garrigues/fllt/test_flltb.cc (revision 3947) +++ garrigues/fllt/test_flltb.cc (working copy) @@ -17,7 +17,7 @@ { using namespace mln; - using typename value::int_u8; + using value::int_u8; // int vs[3][6] = { {0, 0, 0, 1, 1, 1}, // {0, 1, 0, 1, 0, 1}, Index: garrigues/fllt/test_fllt7_inv.cc --- garrigues/fllt/test_fllt7_inv.cc (revision 3947) +++ garrigues/fllt/test_fllt7_inv.cc (working copy) @@ -17,7 +17,7 @@ { using namespace mln; - using typename value::int_u8; + using value::int_u8; int vs[5][5] = { {200, 100, 100, 100, 200}, {200, 100, 0 , 100, 200}, Index: garrigues/fllt/test_fllt13.cc --- garrigues/fllt/test_fllt13.cc (revision 3947) +++ garrigues/fllt/test_fllt13.cc (working copy) @@ -17,7 +17,7 @@ { using namespace mln; - using typename value::int_u8; + using value::int_u8; int vs[5][8] = { { 1, 1, 1, 1, 1, 1, 1, 4 }, { 1, 4, 1, 1, 1, 1, 4, 1 }, Index: garrigues/fllt/test_fllt15.cc --- garrigues/fllt/test_fllt15.cc (revision 3947) +++ garrigues/fllt/test_fllt15.cc (working copy) @@ -17,7 +17,7 @@ { using namespace mln; - using typename value::int_u8; + using value::int_u8; // int vs[3][6] = { {0, 0, 0, 1, 1, 1}, // {0, 1, 0, 1, 0, 1}, Index: garrigues/fllt/test_fllt8.cc --- garrigues/fllt/test_fllt8.cc (revision 3947) +++ garrigues/fllt/test_fllt8.cc (working copy) @@ -17,7 +17,7 @@ { using namespace mln; - using typename value::int_u8; + using value::int_u8; int vs[3][6] = { {0, 0, 0, 1, 1, 1}, {0, 1, 0, 1, 0, 1}, Index: inim/2009/binarization/binarization.hh --- inim/2009/binarization/binarization.hh (revision 3947) +++ inim/2009/binarization/binarization.hh (working copy) @@ -16,18 +16,18 @@ namespace binarization { template<typename I, typename W> - mln_concrete_ch_value(I, bool) + mln_ch_value(I, bool) binarization(const Image<I>& input, const Window<W>& win, int strength); # ifndef MLN_INCLUDE_ONLY namespace impl { template<typename I, typename W> - mln_concrete_ch_value(I, bool) + mln_ch_value(I, bool) binarization_(const I& input, const W& win, int strength) { trace::entering("binarisation_"); - mln_concrete_ch_value(I, bool) output(input.domain()); + mln_ch_value(I, bool) output(input.domain()); histo::data<mln_value(I)> hist = histo::compute (input); image1d<std::size_t> hist_img = convert::to_image(hist); @@ -58,13 +58,13 @@ } template<typename I, typename W> - mln_concrete_ch_value(I, bool) + mln_ch_value(I, bool) binarization(const Image<I>& input, const Window<W>& win, int strength) { trace::entering("binarisation"); mln_precondition(exact(input).is_valid()); - mln_concrete_ch_value(I, bool) output(exact(input).domain()); + mln_ch_value(I, bool) output(exact(input).domain()); output = impl::binarization_(exact(input), exact(win), strength); trace::exiting("binarisation");