[Orxonox-commit 679] r3211 - in branches/netp5/src/network: . packet synchronisable

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-06-23 12:37:53 +0200 (Tue, 23 Jun 2009)
New Revision: 3211

Modified:
   branches/netp5/src/network/NetworkFunction.h
   branches/netp5/src/network/NetworkPrereqs.h
   branches/netp5/src/network/packet/Chat.cc
   branches/netp5/src/network/packet/ClassID.cc
   branches/netp5/src/network/packet/FunctionCalls.cc
   branches/netp5/src/network/packet/FunctionIDs.cc
   branches/netp5/src/network/packet/Gamestate.h
   branches/netp5/src/network/packet/Packet.cc
   branches/netp5/src/network/synchronisable/Synchronisable.cc
   branches/netp5/src/network/synchronisable/Synchronisable.h
   branches/netp5/src/network/synchronisable/SynchronisableVariable.h
Log:
Moved PacketFlag and added includes for memcpy() and abort() (Mingw didn't seem to care).

Modified: branches/netp5/src/network/NetworkFunction.h
===================================================================
--- branches/netp5/src/network/NetworkFunction.h	2009-06-23 10:25:49 UTC (rev 3210)
+++ branches/netp5/src/network/NetworkFunction.h	2009-06-23 10:37:53 UTC (rev 3211)
@@ -32,6 +32,7 @@
 #include "NetworkPrereqs.h"
 
 #include <cassert>
+#include <cstring>
 #include <map>
 #include <string>
 #include <boost/preprocessor/cat.hpp>

Modified: branches/netp5/src/network/NetworkPrereqs.h
===================================================================
--- branches/netp5/src/network/NetworkPrereqs.h	2009-06-23 10:25:49 UTC (rev 3210)
+++ branches/netp5/src/network/NetworkPrereqs.h	2009-06-23 10:37:53 UTC (rev 3211)
@@ -128,16 +128,16 @@
     class NetworkIDs;
     class Packet;
     class Welcome;
-  }
 
-  namespace PacketFlag
-  {
-    enum Enum
+    namespace PacketFlag
     {
-      Reliable   = 1,
-      Unsequence = 2,
-      NoAllocate = 4
-    };
+      enum Enum
+      {
+        Reliable   = 1,
+        Unsequence = 2,
+        NoAllocate = 4
+      };
+    }
   }
 }
 

Modified: branches/netp5/src/network/packet/Chat.cc
===================================================================
--- branches/netp5/src/network/packet/Chat.cc	2009-06-23 10:25:49 UTC (rev 3210)
+++ branches/netp5/src/network/packet/Chat.cc	2009-06-23 10:37:53 UTC (rev 3211)
@@ -28,6 +28,7 @@
 
 #include "Chat.h"
 
+#include <cstring>
 #include <string>
 #include "network/Host.h"
 

Modified: branches/netp5/src/network/packet/ClassID.cc
===================================================================
--- branches/netp5/src/network/packet/ClassID.cc	2009-06-23 10:25:49 UTC (rev 3210)
+++ branches/netp5/src/network/packet/ClassID.cc	2009-06-23 10:37:53 UTC (rev 3211)
@@ -29,6 +29,8 @@
 #include "ClassID.h"
 
 #include <cassert>
+#include <cstdlib>
+#include <cstring>
 #include <map>
 #include <queue>
 #include <string>

Modified: branches/netp5/src/network/packet/FunctionCalls.cc
===================================================================
--- branches/netp5/src/network/packet/FunctionCalls.cc	2009-06-23 10:25:49 UTC (rev 3210)
+++ branches/netp5/src/network/packet/FunctionCalls.cc	2009-06-23 10:37:53 UTC (rev 3211)
@@ -29,6 +29,7 @@
 #include "FunctionCalls.h"
 
 #include <cassert>
+#include <cstring>
 #include "util/MultiType.h"
 #include "network/NetworkFunction.h"
 

Modified: branches/netp5/src/network/packet/FunctionIDs.cc
===================================================================
--- branches/netp5/src/network/packet/FunctionIDs.cc	2009-06-23 10:25:49 UTC (rev 3210)
+++ branches/netp5/src/network/packet/FunctionIDs.cc	2009-06-23 10:37:53 UTC (rev 3211)
@@ -29,6 +29,7 @@
 #include "FunctionIDs.h"
 
 #include <cassert>
+#include <cstring>
 #include <queue>
 #include <string>
 

Modified: branches/netp5/src/network/packet/Gamestate.h
===================================================================
--- branches/netp5/src/network/packet/Gamestate.h	2009-06-23 10:25:49 UTC (rev 3210)
+++ branches/netp5/src/network/packet/Gamestate.h	2009-06-23 10:37:53 UTC (rev 3211)
@@ -33,6 +33,7 @@
 #include "network/NetworkPrereqs.h"
 
 #include <cassert>
+#include <cstring>
 #include <list>
 
 #include "util/CRC32.h"

Modified: branches/netp5/src/network/packet/Packet.cc
===================================================================
--- branches/netp5/src/network/packet/Packet.cc	2009-06-23 10:25:49 UTC (rev 3210)
+++ branches/netp5/src/network/packet/Packet.cc	2009-06-23 10:37:53 UTC (rev 3211)
@@ -30,6 +30,7 @@
 #include "Packet.h"
 
 #include <cassert>
+#include <cstring>
 #include <enet/enet.h>
 #include <boost/static_assert.hpp>
 

Modified: branches/netp5/src/network/synchronisable/Synchronisable.cc
===================================================================
--- branches/netp5/src/network/synchronisable/Synchronisable.cc	2009-06-23 10:25:49 UTC (rev 3210)
+++ branches/netp5/src/network/synchronisable/Synchronisable.cc	2009-06-23 10:37:53 UTC (rev 3211)
@@ -30,6 +30,7 @@
 
 #include "Synchronisable.h"
 
+#include <cstdlib>
 #include "core/CoreIncludes.h"
 #include "core/BaseObject.h"
 #include "network/Host.h"

Modified: branches/netp5/src/network/synchronisable/Synchronisable.h
===================================================================
--- branches/netp5/src/network/synchronisable/Synchronisable.h	2009-06-23 10:25:49 UTC (rev 3210)
+++ branches/netp5/src/network/synchronisable/Synchronisable.h	2009-06-23 10:37:53 UTC (rev 3211)
@@ -32,6 +32,7 @@
 #include "network/NetworkPrereqs.h"
 
 #include <cassert>
+#include <cstring>
 #include <vector>
 #include <map>
 #include <queue>

Modified: branches/netp5/src/network/synchronisable/SynchronisableVariable.h
===================================================================
--- branches/netp5/src/network/synchronisable/SynchronisableVariable.h	2009-06-23 10:25:49 UTC (rev 3210)
+++ branches/netp5/src/network/synchronisable/SynchronisableVariable.h	2009-06-23 10:37:53 UTC (rev 3211)
@@ -33,6 +33,7 @@
 #include "network/NetworkPrereqs.h"
 
 #include <cassert>
+#include <cstring>
 #include "util/Serialise.h"
 #include "core/GameMode.h"
 #include "network/synchronisable/NetworkCallbackManager.h"