[Csp-commits] svn:csp r949 - in trunk/CSP/CSPSim: Include Source Source/Networking

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

Author: wolverine
Date: 2004-05-08 09:25:45 -0700 (Sat, 08 May 2004)
New Revision: 949

Modified:
   trunk/CSP/CSPSim/Include/CSPSim.h
   trunk/CSP/CSPSim/Include/Networking.h
   trunk/CSP/CSPSim/Source/CSPSim.cpp
   trunk/CSP/CSPSim/Source/ClientNode.cpp
   trunk/CSP/CSPSim/Source/DynamicObject.cpp
   trunk/CSP/CSPSim/Source/Networking/MessageSocketDuplex.cpp
   trunk/CSP/CSPSim/Source/Networking/NetworkAddress.cpp
   trunk/CSP/CSPSim/Source/Networking/NetworkBroadcaster.cpp
   trunk/CSP/CSPSim/Source/Networking/NetworkListener.cpp
   trunk/CSP/CSPSim/Source/Networking/NetworkMessage.cpp
   trunk/CSP/CSPSim/Source/Networking/NetworkMessenger.cpp
   trunk/CSP/CSPSim/Source/Networking/NetworkNode.cpp
   trunk/CSP/CSPSim/Source/Networking/NetworkSocket.cpp
   trunk/CSP/CSPSim/Source/Networking/ObjectUpdateMessage.cpp
   trunk/CSP/CSPSim/Source/ServerNode.cpp
Log:
Cleaned up some includes

Modified: trunk/CSP/CSPSim/Include/CSPSim.h
===================================================================
--- trunk/CSP/CSPSim/Include/CSPSim.h	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Include/CSPSim.h	2004-05-08 16:25:45 UTC (rev 949)
@@ -29,6 +29,7 @@
 
 #define _WINSOCKAPI_
 
+
 #include <SimData/Ref.h>
 #include <SimData/Date.h>
 #include <SimData/DataManager.h>

Modified: trunk/CSP/CSPSim/Include/Networking.h
===================================================================
--- trunk/CSP/CSPSim/Include/Networking.h	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Include/Networking.h	2004-05-08 16:25:45 UTC (rev 949)
@@ -25,6 +25,12 @@
 #ifndef __NETWORKING_H__
 #define __NETWORKING_H__
 
+// use this to fix compile problems with mulitple includes of windows and winsock headers.
+#define _WINSOCKAPI_
+
+#include <cc++/network.h>
+
+
 #include <sys/types.h>
 #include <list>
 

Modified: trunk/CSP/CSPSim/Source/CSPSim.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/CSPSim.cpp	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Source/CSPSim.cpp	2004-05-08 16:25:45 UTC (rev 949)
@@ -51,7 +51,6 @@
 #include "ConsoleCommands.h"
 #include "Profile.h"
 
-#include <cc++/network.h>
 #include "Networking.h"
 
 #include <SimData/Types.h>

Modified: trunk/CSP/CSPSim/Source/ClientNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Source/ClientNode.cpp	2004-05-08 16:25:45 UTC (rev 949)
@@ -1,7 +1,6 @@
 
 
 
-#include <cc++/network.h>
 #include "Networking.h"
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/CSP/CSPSim/Source/DynamicObject.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/DynamicObject.cpp	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Source/DynamicObject.cpp	2004-05-08 16:25:45 UTC (rev 949)
@@ -22,6 +22,7 @@
  *
  **/
 
+
 #include <DynamicObject.h>
 #include <Controller.h>
 #include <PhysicsModel.h>
@@ -34,7 +35,6 @@
 
 #include <SimData/Quat.h>
 
-#include <cc++/network.h>
 #include "Networking.h"
 
 using bus::Kinetics;

Modified: trunk/CSP/CSPSim/Source/Networking/MessageSocketDuplex.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Networking/MessageSocketDuplex.cpp	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Source/Networking/MessageSocketDuplex.cpp	2004-05-08 16:25:45 UTC (rev 949)
@@ -21,7 +21,6 @@
  * @file NetworkSocket.cpp:
  * @author Scott Flicker (Wolverine)
  */
-#include <cc++/network.h>
 #include "Networking.h"
 #include "Log.h"
 

Modified: trunk/CSP/CSPSim/Source/Networking/NetworkAddress.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Networking/NetworkAddress.cpp	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Source/Networking/NetworkAddress.cpp	2004-05-08 16:25:45 UTC (rev 949)
@@ -24,7 +24,6 @@
  * This class encapsulates a node in the simulation network.
  */
 
-#include <cc++/network.h>
 #include "Networking.h"
 
 NetworkAddress::NetworkAddress()

Modified: trunk/CSP/CSPSim/Source/Networking/NetworkBroadcaster.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Networking/NetworkBroadcaster.cpp	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Source/Networking/NetworkBroadcaster.cpp	2004-05-08 16:25:45 UTC (rev 949)
@@ -23,7 +23,6 @@
  * 
  * Broadcasts network messages
  */
-#include <cc++/network.h>
 #include "Networking.h"
 
 NetworkBroadcaster::NetworkBroadcaster()

Modified: trunk/CSP/CSPSim/Source/Networking/NetworkListener.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Networking/NetworkListener.cpp	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Source/Networking/NetworkListener.cpp	2004-05-08 16:25:45 UTC (rev 949)
@@ -24,7 +24,6 @@
  * Listens for network messages
  */
 
-#include <cc++/network.h>
 #include "Networking.h"
 
 

Modified: trunk/CSP/CSPSim/Source/Networking/NetworkMessage.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Networking/NetworkMessage.cpp	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Source/Networking/NetworkMessage.cpp	2004-05-08 16:25:45 UTC (rev 949)
@@ -25,7 +25,6 @@
  * Currently contains for header and buffer routines
  */
 
-#include <cc++/network.h>
 #include "Networking.h"
 
 unsigned short NetworkMessage::magicNumber = 0xFCCF;

Modified: trunk/CSP/CSPSim/Source/Networking/NetworkMessenger.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Networking/NetworkMessenger.cpp	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Source/Networking/NetworkMessenger.cpp	2004-05-08 16:25:45 UTC (rev 949)
@@ -22,7 +22,6 @@
  * @author Scott Flicker (Wolverine)
  */
 
-#include <cc++/network.h>
 #include "Networking.h"
 
 NetworkMessenger::NetworkMessenger()

Modified: trunk/CSP/CSPSim/Source/Networking/NetworkNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Networking/NetworkNode.cpp	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Source/Networking/NetworkNode.cpp	2004-05-08 16:25:45 UTC (rev 949)
@@ -24,7 +24,6 @@
  * This class encapsulates a node in the simulation network.
  */
 
-#include <cc++/network.h>
 #include "Networking.h"
 
 NetworkNode::NetworkNode()

Modified: trunk/CSP/CSPSim/Source/Networking/NetworkSocket.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Networking/NetworkSocket.cpp	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Source/Networking/NetworkSocket.cpp	2004-05-08 16:25:45 UTC (rev 949)
@@ -22,7 +22,6 @@
  * @author Scott Flicker (Wolverine)
  */
 
-#include <cc++/network.h>
 #include "Networking.h"
 
 NetworkSocket::NetworkSocket()

Modified: trunk/CSP/CSPSim/Source/Networking/ObjectUpdateMessage.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/Networking/ObjectUpdateMessage.cpp	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Source/Networking/ObjectUpdateMessage.cpp	2004-05-08 16:25:45 UTC (rev 949)
@@ -22,7 +22,6 @@
  * @author Scott Flicker (Wolverine)
  */
 
-#include <cc++/network.h>
 #include "Networking.h"
 
 ObjectUpdateMessage::ObjectUpdateMessage(simdata::uint16 id, simdata::Vector3 position, simdata::Vector3 velocity)

Modified: trunk/CSP/CSPSim/Source/ServerNode.cpp
===================================================================
--- trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-08 14:37:10 UTC (rev 948)
+++ trunk/CSP/CSPSim/Source/ServerNode.cpp	2004-05-08 16:25:45 UTC (rev 949)
@@ -1,4 +1,3 @@
-#include <cc++/network.h>
 #include "Networking.h"
 #include "ServerNode.h"
 #include <stdio.h>