summaryrefslogtreecommitdiff
path: root/2005/i/robert/src/timer
diff options
context:
space:
mode:
authorschodet2005-03-06 17:25:30 +0000
committerschodet2005-03-06 17:25:30 +0000
commitfe22d081263ca0398b73527944a946e8cfb8510b (patch)
treee77b8a0507d00642419e1794ed1c2bbcd3b28798 /2005/i/robert/src/timer
parentc875c4c168bed649b0bc5fd480e28e4f4ddf0322 (diff)
Bugfix.
Diffstat (limited to '2005/i/robert/src/timer')
-rw-r--r--2005/i/robert/src/timer/Makefile.defs2
-rw-r--r--2005/i/robert/src/timer/timer.cc2
-rw-r--r--2005/i/robert/src/timer/timer.hh2
3 files changed, 3 insertions, 3 deletions
diff --git a/2005/i/robert/src/timer/Makefile.defs b/2005/i/robert/src/timer/Makefile.defs
index 0235646..e7b58cc 100644
--- a/2005/i/robert/src/timer/Makefile.defs
+++ b/2005/i/robert/src/timer/Makefile.defs
@@ -1,6 +1,6 @@
PROGRAMS += test_timer
-timer_OBJECTS = timer.cc
+timer_OBJECTS = timer.o
test_timer_OBJECTS = test_timer.o $(timer_OBJECTS)
diff --git a/2005/i/robert/src/timer/timer.cc b/2005/i/robert/src/timer/timer.cc
index d70ee63..662e6de 100644
--- a/2005/i/robert/src/timer/timer.cc
+++ b/2005/i/robert/src/timer/timer.cc
@@ -44,7 +44,7 @@ Timer::getRoundTime (void)
}
/// Démare le match et enregistre le temps de départ.
-int
+void
Timer::startRound (void)
{
Timer &timer = getInstance ();
diff --git a/2005/i/robert/src/timer/timer.hh b/2005/i/robert/src/timer/timer.hh
index 23f2ea7..341f1da 100644
--- a/2005/i/robert/src/timer/timer.hh
+++ b/2005/i/robert/src/timer/timer.hh
@@ -35,7 +35,7 @@ class Timer
/// Retourne le temps depuis le début du match en millisecondes.
static int getRoundTime (void);
/// Démare le match et enregistre le temps de départ.
- static int startRound (void);
+ static void startRound (void);
/// Attend un nombre de millisecondes. Attention, le robot ne fait
/// absolument rien pendant cette periode !
static void wait (int t);