summaryrefslogtreecommitdiff
path: root/clock.cpp
diff options
context:
space:
mode:
authorJohn Fultz <jfultz@wolfram.com>2015-07-21 10:18:57 -0500
committerJohn Fultz <jfultz@wolfram.com>2015-07-21 10:18:57 -0500
commitd912747a68c38baa1d19e07067d8c691f29f8198 (patch)
treef221b417220ffe5b6adbf3ca8210c788379d7842 /clock.cpp
parent46fc18d0d167cc6feacfb41fadb207a1234ccc26 (diff)
Visual Studio build maintenance.
* Fix compiler warnings * Add Visual Studio 2013 solution * Tweak .pro files * Most importantly, rename main 'quackle' project to 'libquackle' to avoid solution-level name conflict. This only affects the VS build.
Diffstat (limited to 'clock.cpp')
-rw-r--r--clock.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clock.cpp b/clock.cpp
index b38b0c7..3c40783 100644
--- a/clock.cpp
+++ b/clock.cpp
@@ -36,7 +36,7 @@ void Stopwatch::start()
int Stopwatch::elapsed() const
{
time_t now = time(NULL);
- return now - m_startTime;
+ return (int) (now - m_startTime);
}
bool Stopwatch::exceeded(int seconds) const