summaryrefslogtreecommitdiff
path: root/lib/common
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2007-03-24 23:35:33 +0000
committerChris Wilson <chris+github@qwirx.com>2007-03-24 23:35:33 +0000
commitd54680e632e0d5b142568e620dde069820a9476d (patch)
tree1076d9ccefb7fbea9d2481ebac4c0bb9cbac2130 /lib/common
parentc8f1f7f46616be81b4b6ec679ea5228e5a03ac7c (diff)
Compile fix to [1448] (refs #3)
Diffstat (limited to 'lib/common')
-rw-r--r--lib/common/Timer.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/common/Timer.cpp b/lib/common/Timer.cpp
index c5b90ec2..fe565c21 100644
--- a/lib/common/Timer.cpp
+++ b/lib/common/Timer.cpp
@@ -262,13 +262,13 @@ Timer::Timer(size_t timeoutSecs)
gettimeofday(&tv, NULL);
if (timeoutSecs == 0)
{
- BOX_TRACE(tv.tv_secs << "." << tv.tv_usecs <<
+ BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
": timer " << this << " initialised for " <<
timeoutSecs << " secs, will not fire");
}
else
{
- BOX_TRACE(tv.tv_secs << "." << tv.tv_usecs <<
+ BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
": timer " << this << " initialised for " <<
timeoutSecs << " secs, to fire at " <<
(int)(mExpires / 1000000) << "." <<
@@ -291,7 +291,7 @@ Timer::~Timer()
#if !defined NDEBUG && !defined WIN32
struct timeval tv;
gettimeofday(&tv, NULL);
- BOX_TRACE(tv.tv_secs << "." << tv.tv_usecs <<
+ BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
": timer " << this << " destroyed");
#endif
@@ -307,19 +307,19 @@ Timer::Timer(const Timer& rToCopy)
gettimeofday(&tv, NULL);
if (mExpired)
{
- BOX_TRACE(tv.tv_secs << "." << tv.tv_usecs <<
+ BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
": timer " << this << " initialised from timer " <<
&rToCopy << ", already expired, will not fire");
}
else if (mExpires == 0)
{
- BOX_TRACE(tv.tv_secs << "." << tv.tv_usecs <<
+ BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
": timer " << this << " initialised from timer " <<
&rToCopy << ", no expiry, will not fire");
}
else
{
- BOX_TRACE(tv.tv_secs << "." << tv.tv_usecs <<
+ BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
": timer " << this << " initialised from timer " <<
&rToCopy << " to fire at " <<
(int)(mExpires / 1000000) << "." <<
@@ -340,19 +340,19 @@ Timer& Timer::operator=(const Timer& rToCopy)
gettimeofday(&tv, NULL);
if (rToCopy.mExpired)
{
- BOX_TRACE(tv.tv_secs << "." << tv.tv_usecs <<
+ BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
": timer " << this << " initialised from timer " <<
&rToCopy << ", already expired, will not fire");
}
else if (rToCopy.mExpires == 0)
{
- BOX_TRACE(tv.tv_secs << "." << tv.tv_usecs <<
+ BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
": timer " << this << " initialised from timer " <<
&rToCopy << ", no expiry, will not fire");
}
else
{
- BOX_TRACE(tv.tv_secs << "." << tv.tv_usecs <<
+ BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
": timer " << this << " initialised from timer " <<
&rToCopy << " to fire at " <<
(int)(rToCopy.mExpires / 1000000) << "." <<
@@ -375,7 +375,7 @@ void Timer::OnExpire()
#if !defined NDEBUG && !defined WIN32
struct timeval tv;
gettimeofday(&tv, NULL);
- BOX_TRACE(tv.tv_secs << "." << tv.tv_usecs <<
+ BOX_TRACE(tv.tv_sec << "." << tv.tv_usec <<
": timer " << this << " fired");
#endif