summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2007-01-03 19:10:16 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2007-01-03 19:10:16 +0000
commit72c2a65e7f02685f065840a4ddac8ef90905afb3 (patch)
tree21de2b7aca728ce453dbe95362376e7516c091d5
parent620b24ad926e5b7b8d7f2e9accff82df9ce8f0bf (diff)
downloadmanaserv-72c2a65e7f02685f065840a4ddac8ef90905afb3.tar.gz
manaserv-72c2a65e7f02685f065840a4ddac8ef90905afb3.tar.bz2
manaserv-72c2a65e7f02685f065840a4ddac8ef90905afb3.tar.xz
manaserv-72c2a65e7f02685f065840a4ddac8ef90905afb3.zip
Fix building with --pedantic.
-rw-r--r--ChangeLog5
-rw-r--r--src/utils/timer.cpp12
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d5fbe6b..b546a09a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-03 Björn Steinbrink <B.Steinbrink@gmx.de>
+
+ * src/utils/timer.cpp: Removed extra semicolons that break builds with
+ --pedantic.
+
2007-01-03 Guillaume Melquiond <guillaume.melquiond@gmail.com>
* src/debug.h, src/debug.cpp, src/Makefile.am: Removed obsolete debug
diff --git a/src/utils/timer.cpp b/src/utils/timer.cpp
index f055e664..b0a05bc5 100644
--- a/src/utils/timer.cpp
+++ b/src/utils/timer.cpp
@@ -30,7 +30,7 @@ Timer::Timer(unsigned int ms, bool createActive)
active = createActive;
interval = ms;
lastpulse = getTimeInMillisec();
-};
+}
void Timer::sleep()
{
@@ -56,23 +56,23 @@ int Timer::poll()
lastpulse += interval * elapsed;
};
return elapsed;
-};
+}
void Timer::start()
{
active = true;
lastpulse = getTimeInMillisec();
-};
+}
void Timer::stop()
{
active = false;
-};
+}
void Timer::changeInterval(unsigned int newinterval)
{
interval = newinterval;
-};
+}
uint64_t Timer::getTimeInMillisec()
{
@@ -82,6 +82,6 @@ uint64_t Timer::getTimeInMillisec()
gettimeofday(&time, 0);
timeInMillisec = (uint64_t)time.tv_sec * 1000 + time.tv_usec / 1000;
return timeInMillisec;
-};
+}
} // ::utils