[Olena-patches] olena-2.0-69-g9f51f7b Work around an overload resolution problem reported by g++ 4.7.

* src/debug/show_separators.cc, * src/util/component_precise_outline.cc: Here. --- scribo/ChangeLog | 8 ++++++++ scribo/src/debug/show_separators.cc | 5 ++++- scribo/src/util/component_precise_outline.cc | 5 ++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index eafcc32..b4f5b9f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2012-10-09 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Work around an overload resolution problem reported by g++ 4.7. + + * src/debug/show_separators.cc, + * src/util/component_precise_outline.cc: + Here. + 2011-12-06 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; * scribo/text/recognition.hh: Restore previous locale. diff --git a/scribo/src/debug/show_separators.cc b/scribo/src/debug/show_separators.cc index 40e2fde..5b6e038 100644 --- a/scribo/src/debug/show_separators.cc +++ b/scribo/src/debug/show_separators.cc @@ -75,7 +75,10 @@ int main(int argc, char *argv[]) v_lines += h_lines; t.stop(); - std::cout << t << "s" << std::endl; + /* FIXME: Help the compiler to ``unproxy' the float stored in the + timer. There is a problem with an overload resolution of + `mln::unproxy_rec' here. */ + std::cout << t.read() << "s" << std::endl; // Save binary image. io::pbm::save(v_lines, argv[2]); diff --git a/scribo/src/util/component_precise_outline.cc b/scribo/src/util/component_precise_outline.cc index 09c3f90..158f8c2 100644 --- a/scribo/src/util/component_precise_outline.cc +++ b/scribo/src/util/component_precise_outline.cc @@ -70,7 +70,10 @@ int main(int argc, char *argv[]) par_t par = scribo::util::component_precise_outline(input); t.stop(); - std::cout << t << std::endl; + /* FIXME: Help the compiler to ``unproxy' the float stored in the + timer. There is a problem with an overload resolution of + `mln::unproxy_rec' here. */ + std::cout << t.read() << std::endl; image2d<value::rgb8> input_rgb = data::convert(value::rgb8(), input); -- 1.7.2.5