Changeset 1846 for code/branches/orxonox_tutorial/src/network

Timestamp:

Sep 28, 2008, 2:27:03 PM (16 years ago)

Author:

rgrieder

Message:

Merged Revisions 1831 - 1845 to tutorial. This is an update from the trunk.

Location:

code/branches/orxonox_tutorial

Files:

• . (modified) (1 prop)
• src/network/ConnectionManager.cc (modified) (2 diffs)
• src/network/Synchronisable.cc (modified) (1 diff)
• src/network/Synchronisable.h (modified) (1 diff)
• src/network/packet/Chat.h (modified) (1 diff)
• src/network/packet/ClassID.cc (modified) (1 diff)

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

@@ -37 +37 @@
 // Author:  Oliver Scheuss
 //
+
+#include "ConnectionManager.h"
 
 #include <iostream>
@@ -51 +53 @@
 #include "util/Sleep.h"
 #include "ClientInformation.h"
-#include "ConnectionManager.h"
 #include "Synchronisable.h"
 #include "packet/ClassID.h"

code/branches/orxonox_tutorial/src/network/Synchronisable.cc

@@ -41 +41 @@
 #include "Synchronisable.h"
 
-#include <string>
+#include <cstring>
 #include <iostream>
 #include <assert.h>

code/branches/orxonox_tutorial/src/network/Synchronisable.h

@@ -34 +34 @@
 #include <list>
 #include "core/OrxonoxClass.h"
-#include "util/XMLIncludes.h"
+#include "core/XMLIncludes.h"
 #include "NetworkCallback.h"
 

code/branches/orxonox_tutorial/src/network/packet/Chat.h

@@ -4 +4 @@
 
 #include <string>
+#include <cstring>
 
 #include "Packet.h"

code/branches/orxonox_tutorial/src/network/packet/ClassID.cc

@@ -31 +31 @@
 #include "ClassID.h"
 #include "core/CoreIncludes.h"
-#include <string>
+#include <cstring>
 #include <assert.h>