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

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

Author: wolverine
Date: 2004-05-08 07:34:55 -0700 (Sat, 08 May 2004)
New Revision: 947

Modified:
   trunk/CSP/CSPSim/Source/CSPSim.cpp
   trunk/CSP/CSPSim/Source/DynamicObject.cpp
   trunk/CSP/CSPSim/Source/ServerNode.cpp
Log:
removed a timer

Modified: trunk/CSP/CSPSim/Source/CSPSim.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/CSPSim.cpp	2004-05-08 14:32:32 UTC (rev 946)
+++ trunk/CSP/CSPSim/Source/CSPSim.cpp	2004-05-08 14:34:55 UTC (rev 947)
@@ -22,6 +22,8 @@
  *
  */
 
+
+
 #ifdef _DEBUG
 #undef _DEBUG
 #include <Python.h>

Modified: trunk/CSP/CSPSim/Source/DynamicObject.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/DynamicObject.cpp	2004-05-08 14:32:32 UTC (rev 946)
+++ trunk/CSP/CSPSim/Source/DynamicObject.cpp	2004-05-08 14:34:55 UTC (rev 947)
@@ -22,8 +22,6 @@
  *
  **/
 
-#include <cc++/network.h>
-#include "Networking.h"
 #include <DynamicObject.h>
 #include <Controller.h>
 #include <PhysicsModel.h>
@@ -36,6 +34,8 @@
 
 #include <SimData/Quat.h>
 
+#include <cc++/network.h>
+#include "Networking.h"
 
 using bus::Kinetics;
 

Modified: trunk/CSP/CSPSim/Source/ServerNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-08 14:32:32 UTC (rev 946)
+++ trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-08 14:34:55 UTC (rev 947)
@@ -3,7 +3,9 @@
 #include "ServerNode.h"
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 
 ServerNode::ServerNode()
 {
@@ -27,7 +29,7 @@
     memset((void*)message.getPayloadPtr(), 0, 100);
     if (numreceived == 0)
     {
-	::sleep(5);
+//	::sleep(5);
     }
   }