* mln/util/timer.hh: Rely on the default copy constructor and the default (copy-)assignment operator. --- milena/ChangeLog | 7 +++++++ milena/mln/util/timer.hh | 15 --------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f39e9e5..318d02e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-06-18 Roland Levillain <roland@lrde.epita.fr> + + Make mln::util::timer copy-constructible and (copy-)assignable. + + * mln/util/timer.hh: Rely on the default copy constructor and + the default (copy-)assignment operator. + 2013-06-14 Roland Levillain <roland@lrde.epita.fr> Shell-related portability fixes in Milena's Makefiles. diff --git a/milena/mln/util/timer.hh b/milena/mln/util/timer.hh index 7afff72..adfebef 100644 --- a/milena/mln/util/timer.hh +++ b/milena/mln/util/timer.hh @@ -49,13 +49,6 @@ namespace mln timer(); - // Explicit copy constructor (in most cases should not be - // used...). - explicit timer(const timer&); - - // Without impl. - void operator=(const timer&); - ~timer(); void start(); @@ -105,14 +98,6 @@ namespace mln } inline - timer::timer(const timer& t) - { - running_ = t.running_; - start_ = t.start_; - time_ = t.time_; - } - - inline timer::~timer() { reset(); -- 1.7.10.4