Changeset 9869 in orxonox.OLD for trunk/src/lib/network/tcp_socket.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/network/tcp_socket.cc (modified) (6 diffs)

trunk/src/lib/network/tcp_socket.cc

@@ -30 +30 @@
 #include "debug.h"
 
+ObjectListDefinition(TcpSocket);
 /**
  * Default constructor
@@ -60 +61 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_NETWORK_SOCKET, "TcpSocket");
+  this->registerObject(this, TcpSocket::_objectList);
 
   tcpSocket = NULL;
@@ -122 +123 @@
 {
   IPaddress ip;
-  
-  bOk = true; 
-  
+
+  bOk = true;
+
   if ( SDLNet_ResolveHost( &ip, host.c_str(), port ) != 0 )
   {
@@ -131 +132 @@
     return;
   }
-  
+
   //check if not already connected or listening
   if (tcpSocket)
@@ -345 +346 @@
 }
 #endif
-  
+
   PRINTF(0)("QUIT READ THREAD\n");
-  
+
   return 0;
 }
@@ -425 +426 @@
 
   return 0;
-  
+
 }