* tests/util/timer.cc: New test. * tests/util/Makefile.am (check_PROGRAMS): Add timer. (timer_SOURCES): New. --- milena/ChangeLog | 8 ++++++++ milena/tests/util/Makefile.am | 4 +++- milena/tests/{metal/math/root.cc => util/timer.cc} | 15 ++++++++++----- 3 files changed, 21 insertions(+), 6 deletions(-) copy milena/tests/{metal/math/root.cc => util/timer.cc} (84%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6ce0fe2..753a706 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2012-10-09 Roland Levillain <roland@lrde.epita.fr> + + Highlight an overload resolution problem in proxies with g++-4.7. + + * tests/util/timer.cc: New test. + * tests/util/Makefile.am (check_PROGRAMS): Add timer. + (timer_SOURCES): New. + 2012-10-08 Roland Levillain <roland@lrde.epita.fr> Revive headers required by the RGB component functors. diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am index 0a1119e..65c1a3d 100644 --- a/milena/tests/util/Makefile.am +++ b/milena/tests/util/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -32,6 +32,7 @@ check_PROGRAMS = \ ord_pair \ set \ soft_heap \ + timer \ tree \ tree_fast \ tree_to_fast @@ -49,6 +50,7 @@ ord_SOURCES = ord.cc ord_pair_SOURCES = ord_pair.cc set_SOURCES = set.cc soft_heap_SOURCES = soft_heap.cc +timer_SOURCES = timer.cc tree_SOURCES = tree.cc tree_fast_SOURCES = tree_fast.cc tree_to_fast_SOURCES = tree_to_fast.cc diff --git a/milena/tests/metal/math/root.cc b/milena/tests/util/timer.cc similarity index 84% copy from milena/tests/metal/math/root.cc copy to milena/tests/util/timer.cc index 6554554..09170b9 100644 --- a/milena/tests/metal/math/root.cc +++ b/milena/tests/util/timer.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,15 +23,20 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#include <unistd.h> + #include <iostream> -#include <mln/core/contract.hh> -#include <mln/metal/math/root.hh> +#include <mln/util/timer.hh> int main() { using namespace mln; - int res = metal::math::root<3,8>::value; - mln_assertion(res == 2); + util::timer t; + t.start(); + sleep(1); + t.stop(); + + std::cout << t << std::endl; } -- 1.7.2.5