[Csp-commits] svn:csp r1120 - trunk/CSP/CSPSim/Source

[<sv...@ww...>]

Author: delta
Date: 2004-06-29 04:30:33 -0700 (Tue, 29 Jun 2004)
New Revision: 1120

Modified:
   trunk/CSP/CSPSim/Source/SynchronousUpdate.cpp
Log:
min/max workaround.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1120

Modified: trunk/CSP/CSPSim/Source/SynchronousUpdate.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/SynchronousUpdate.cpp	2004-06-29 11:29:54 UTC (rev 1119)
+++ trunk/CSP/CSPSim/Source/SynchronousUpdate.cpp	2004-06-29 11:30:33 UTC (rev 1120)
@@ -22,10 +22,10 @@
  *
  **/
 
-
 #include <SynchronousUpdate.h>
 
 
+
 int UpdateProxy::update(double time) {
 	if (!m_Target) return DEAD;
 	double dt = m_Target->onUpdate(time - m_LastUpdateTime);
@@ -42,7 +42,7 @@
 UpdateProxy::Ref UpdateMaster::registerUpdate(UpdateTarget *target, double delay) {
 	UpdateProxy::Ref proxy;
 	if (target) {
-		delay = std::max(0.0, delay);
+		delay = std::max<double>(0.0, delay);
 		proxy = new UpdateProxy(target, this, m_Time + delay);
 		if (delay > 0.0) {
 			m_DelayQueue.push_back(proxy);