Changeset 2111 for code/branches/objecthierarchy/src/network

Timestamp:

Nov 2, 2008, 12:38:26 PM (16 years ago)

Author:

rgrieder

Message:

Moved all util classes and functions to orxonox namespace.
Converted all code to 4 spaces/tab in util.

Location:

code/branches/objecthierarchy/src/network

Files:

• ClientConnection.cc (modified) (2 diffs)
• ConnectionManager.cc (modified) (1 diff)
• packet/Gamestate.cc (modified) (2 diffs)

code/branches/objecthierarchy/src/network/ClientConnection.cc

@@ -72 +72 @@
   bool ClientConnection::waitEstablished(int milisec) {
     for(int i=0; i<=milisec && !established; i++)
-      msleep(1);
+      orxonox::msleep(1);
 
     return established;
@@ -184 +184 @@
       case ENET_EVENT_TYPE_NONE:
         //receiverThread_->yield();
-        msleep(1);
+        orxonox::msleep(1);
         break;
       }

code/branches/objecthierarchy/src/network/ConnectionManager.cc

@@ -227 +227 @@
         case ENET_EVENT_TYPE_NONE:
           //receiverThread_->yield();
-          msleep(1);
+          orxonox::msleep(1);
           break;
       }

code/branches/objecthierarchy/src/network/packet/Gamestate.cc

@@ -244 +244 @@
   //copy and modify header
 #ifndef NDEBUG
-  HEADER->crc32 = calcCRC(data_+sizeof(GamestateHeader), HEADER->datasize);
+  HEADER->crc32 = orxonox::calcCRC(data_+sizeof(GamestateHeader), HEADER->datasize);
 #endif
   *GAMESTATE_HEADER(ndata) = *HEADER;
@@ -281 +281 @@
   }
 #ifndef NDEBUG
-  assert(HEADER->crc32==calcCRC(ndata+sizeof(GamestateHeader), HEADER->datasize));
+  assert(HEADER->crc32==orxonox::calcCRC(ndata+sizeof(GamestateHeader), HEADER->datasize));
 #endif