[Hgengine-cvs] SF.net SVN: hgengine:[136] Mercury2/src

[<axl...@us...>]

Revision: 136
          http://hgengine.svn.sourceforge.net/hgengine/?rev=136&view=rev
Author:   axlecrusher
Date:     2009-01-02 01:15:53 +0000 (Fri, 02 Jan 2009)

Log Message:
-----------
inline age

Modified Paths:
--------------
    Mercury2/src/MercuryTimer.cpp
    Mercury2/src/MercuryTimer.h

Modified: Mercury2/src/MercuryTimer.cpp
===================================================================
--- Mercury2/src/MercuryTimer.cpp	2009-01-01 17:04:02 UTC (rev 135)
+++ Mercury2/src/MercuryTimer.cpp	2009-01-02 01:15:53 UTC (rev 136)
@@ -42,11 +42,6 @@
 	return Age();
 }
 
-float MercuryTimer::Age()
-{
-	return (m_thisTouch - m_lastTouch)/1000000.0f;
-}
-
 const MercuryTimer& MercuryTimer::operator=(const MercuryTimer& t)
 {
 	m_lastTouch = t.m_lastTouch;

Modified: Mercury2/src/MercuryTimer.h
===================================================================
--- Mercury2/src/MercuryTimer.h	2009-01-01 17:04:02 UTC (rev 135)
+++ Mercury2/src/MercuryTimer.h	2009-01-02 01:15:53 UTC (rev 136)
@@ -3,6 +3,8 @@
 
 #include <stdint.h>
 
+int64_t GetTimeInMicroSeconds();
+
 class MercuryTimer
 {
 	public:
@@ -17,7 +19,7 @@
 		float Touch(const MercuryTimer& t);
 		
 		///time between last last touch and this touch
-		float Age();
+		inline float Age() { return (m_thisTouch - m_lastTouch)/1000000.0f; }
 		
 		const MercuryTimer& operator=(const MercuryTimer& t);
 	private:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.