Changeset 5592 in orxonox.OLD for branches/network/src/lib/network/network_socket.h

Timestamp:

Nov 16, 2005, 2:12:30 PM (18 years ago)

Author:

rennerc

Message:

resolved conflict

File:

• branches/network/src/lib/network/network_socket.h (modified) (1 diff)

branches/network/src/lib/network/network_socket.h

@@ -11 +11 @@
 #include "netdefs.h"
 
-/* include SDL_net header */
-#include "confincl.h"
 
+/* include base_object.h since all classes are derived from this one */
+#include "base_object.h"
 
 /* using namespace std is default, this needs to be here */
 using namespace std;
 
-class NetworkSocket
+class NetworkSocket : public BaseObject
 {
 
 private:
-        IPaddress serverAddress;
-        unsigned int port;
-        TCPsocket tcpSocket;
-        UDPsocket udpSocket;
+  IPaddress serverAddress;
+  unsigned int port;
+  TCPsocket tcpSocket;
+  UDPsocket udpSocket;
 
 public: