[Box Backup-commit] COMMIT r1485 - box/chris/general/lib/common

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2007-03-24 23:37:26 +0000 (Sat, 24 Mar 2007)
New Revision: 1485

Modified:
   box/chris/general/lib/common/Timer.cpp
Log:
Compile fix to [1448] (merges back [1484])


Modified: box/chris/general/lib/common/Timer.cpp
===================================================================
--- box/chris/general/lib/common/Timer.cpp	2007-03-24 23:35:33 UTC (rev 1484)
+++ box/chris/general/lib/common/Timer.cpp	2007-03-24 23:37:26 UTC (rev 1485)
@@ -262,13 +262,13 @@
 	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 @@
 	#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 @@
 	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 @@
 	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 @@
 	#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