[patch] armagetronad 0.2.8.2.1 patch used by armagetronad-0.2.8.2.1-r1.ebuild

armagetronad-gcc43.patch (text/plain), 8.01 KB, created by Giuseppe Marco Randazzo <zeld> on 2008-09-28 21:00:31 UTC

diff -Naur src_old/engine/ePlayer.cpp src/engine/ePlayer.cpp
--- src_old/engine/ePlayer.cpp	2006-06-02 22:38:09.000000000 +0200
+++ src/engine/ePlayer.cpp	2008-09-27 20:03:24.000000000 +0200
@@ -497,7 +497,7 @@
 
 
 
-static char *default_instant_chat[]=
+static const char *default_instant_chat[]=
     {"/team \\",
      "/msg \\",
      "/me \\",
diff -Naur src_old/engine/eTeam.cpp src/engine/eTeam.cpp
--- src_old/engine/eTeam.cpp	2006-05-13 16:17:31.000000000 +0200
+++ src/engine/eTeam.cpp	2008-09-27 20:16:21.000000000 +0200
@@ -45,7 +45,7 @@
       {  7,  7,  7 }   // black
     };
 
-static char* se_team_name[TEAMCOLORS]=
+static const char* se_team_name[TEAMCOLORS]=
     {
         "$team_name_blue",
         "$team_name_gold",
diff -Naur src_old/network/md5.cpp src/network/md5.cpp
--- src_old/network/md5.cpp	2004-11-29 11:26:42.000000000 +0100
+++ src/network/md5.cpp	2008-09-27 19:04:47.000000000 +0200
@@ -78,6 +78,7 @@
 
 #include <string>
 #include <memory>
+#include <cstring>
 
 #ifdef TEST
 /*
diff -Naur src_old/network/nKrawall.cpp src/network/nKrawall.cpp
--- src_old/network/nKrawall.cpp	2005-07-13 23:04:21.000000000 +0200
+++ src/network/nKrawall.cpp	2008-09-27 19:16:54.000000000 +0200
@@ -43,7 +43,8 @@
 #include "tRandom.h"
 
 #include <stdlib.h>
-#include <string>
+//#include <string>
+#include <cstring>
 
 bool nKrawall::MayRequirePassword(tString& adress, unsigned int port)
 {
diff -Naur src_old/network/nNetObject.h src/network/nNetObject.h
--- src_old/network/nNetObject.h	2006-01-15 00:04:33.000000000 +0100
+++ src/network/nNetObject.h	2008-09-27 16:13:04.000000000 +0200
@@ -31,6 +31,7 @@
 #include "nNetwork.h"
 #include "tArray.h"
 #include "tConsole.h"
+#include "cstring"
 
 class nObserver;
 
diff -Naur src_old/network/nNetwork.cpp src/network/nNetwork.cpp
--- src_old/network/nNetwork.cpp	2006-08-04 20:56:13.000000000 +0200
+++ src/network/nNetwork.cpp	2008-09-27 19:29:05.000000000 +0200
@@ -40,6 +40,7 @@
 #include <stdlib.h>
 #include <fstream>
 #include "tMath.h"
+#include <cstring>
 
 #ifndef WIN32
 #include  <netinet/in.h>
diff -Naur src_old/network/nSocket.cpp src/network/nSocket.cpp
--- src_old/network/nSocket.cpp	2006-05-13 16:17:31.000000000 +0200
+++ src/network/nSocket.cpp	2008-09-27 19:58:47.000000000 +0200
@@ -36,7 +36,7 @@
 
 #include "tRandom.h"
 
-#include <string>
+#include <cstring>
 #include <stdio.h>
 
 #include <sys/types.h>
diff -Naur src_old/render/rModel.cpp src/render/rModel.cpp
--- src_old/render/rModel.cpp	2005-11-18 00:38:17.000000000 +0100
+++ src/render/rModel.cpp	2008-09-27 16:21:03.000000000 +0200
@@ -35,7 +35,7 @@
 #include "tConfiguration.h"
 #include "tLocale.h"
 #include "rGL.h"
-
+#include "cstring"
 
 static rModel *sr_ModelAnchor;
 
diff -Naur src_old/tools/tArray.cpp src/tools/tArray.cpp
--- src_old/tools/tArray.cpp	2005-06-15 19:09:09.000000000 +0200
+++ src/tools/tArray.cpp	2008-09-27 20:06:58.000000000 +0200
@@ -31,7 +31,7 @@
 #include "tMemManager.h"
 #include <iostream>
 #include <stdlib.h>
-#include <string>
+#include <cstring>
 #include "tArray.h"
 
 void GrowingArrayBase::ComplainIfFull(){
diff -Naur src_old/tools/tCommandLine.cpp src/tools/tCommandLine.cpp
--- src_old/tools/tCommandLine.cpp	2005-12-05 21:30:46.000000000 +0100
+++ src/tools/tCommandLine.cpp	2008-09-27 23:02:11.000000000 +0200
@@ -34,6 +34,7 @@
 #include    "tLocale.h"
 #include    "tConfiguration.h"
 #include    "tException.h"
+#include    <cstring>
 
 #ifdef WIN32
 #include    <windows.h>
diff -Naur src_old/tools/tConfiguration.cpp src/tools/tConfiguration.cpp
--- src_old/tools/tConfiguration.cpp	2006-05-13 16:17:31.000000000 +0200
+++ src/tools/tConfiguration.cpp	2008-09-27 20:12:26.000000000 +0200
@@ -32,7 +32,7 @@
 #include "tConfiguration.h"
 #include <stdlib.h>
 #include <ctype.h>
-#include <string>
+#include <cstring>
 #include <sstream>
 #include "tString.h"
 #include "tToDo.h"
diff -Naur src_old/tools/tCrypt.cpp src/tools/tCrypt.cpp
--- src_old/tools/tCrypt.cpp	2004-11-29 11:26:42.000000000 +0100
+++ src/tools/tCrypt.cpp	2008-09-27 20:19:01.000000000 +0200
@@ -28,7 +28,7 @@
 #include "tCrypt.h"
 #include "tMemManager.h"
 
-#include <string>
+#include <cstring>
 
 class tCryptDummy: public tCrypt
 {
diff -Naur src_old/tools/tDirectories.cpp src/tools/tDirectories.cpp
--- src_old/tools/tDirectories.cpp	2006-06-02 22:38:09.000000000 +0200
+++ src/tools/tDirectories.cpp	2008-09-27 22:10:25.000000000 +0200
@@ -32,6 +32,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <cstring>
 
 #include "tLocale.h"
 #include "tDirectories.h"
diff -Naur src_old/tools/tError.cpp src/tools/tError.cpp
--- src_old/tools/tError.cpp	2006-03-16 00:16:59.000000000 +0100
+++ src/tools/tError.cpp	2008-09-27 22:43:00.000000000 +0200
@@ -32,6 +32,8 @@
 #endif
 #include "tError.h"
 #include "tString.h"
+#include <cstdlib>
+#include <cstring>
 
 #ifdef DEBUG
 tLevel st_debugLevel[2]={static_cast<tLevel>(DEBUG),static_cast<tLevel>(DEBUG)};
diff -Naur src_old/tools/tLocale.cpp src/tools/tLocale.cpp
--- src_old/tools/tLocale.cpp	2005-09-09 23:49:42.000000000 +0200
+++ src/tools/tLocale.cpp	2008-09-27 22:48:25.000000000 +0200
@@ -32,7 +32,7 @@
 #include "tSafePTR.h"
 
 #include <fstream>
-#include <string>
+#include <cstring>
 #include <map>
 
 class tLocaleSubItem; // identifies a single string in a single language
diff -Naur src_old/tools/tLocale-gcc43.pathc src/tools/tLocale-gcc43.pathc
--- src_old/tools/tLocale-gcc43.pathc	1970-01-01 01:00:00.000000000 +0100
+++ src/tools/tLocale-gcc43.pathc	2008-09-27 22:49:07.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/tools/tLocale.cpp.orig	2008-09-27 22:48:03.000000000 +0200
++++ src/tools/tLocale.cpp	2008-09-27 22:48:25.000000000 +0200
+@@ -32,7 +32,7 @@
+ #include "tSafePTR.h"
+ 
+ #include <fstream>
+-#include <string>
++#include <cstring>
+ #include <map>
+ 
+ class tLocaleSubItem; // identifies a single string in a single language
diff -Naur src_old/tools/tMemManager.cpp src/tools/tMemManager.cpp
--- src_old/tools/tMemManager.cpp	2006-05-13 16:17:31.000000000 +0200
+++ src/tools/tMemManager.cpp	2008-09-27 23:25:02.000000000 +0200
@@ -35,6 +35,7 @@
 #include <stdio.h>  // need basic C IO since STL IO does memory management
 #include "tMemManager.h"
 #include "tError.h"
+#include <cstring>
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
diff -Naur src_old/tools/tRandom.cpp src/tools/tRandom.cpp
--- src_old/tools/tRandom.cpp	2005-12-05 21:30:47.000000000 +0100
+++ src/tools/tRandom.cpp	2008-09-27 23:11:36.000000000 +0200
@@ -36,6 +36,8 @@
 
 #include    "tError.h"
 #include    "tRecorder.h"
+#include    <cstring>
+#include    <cstdlib>
 
 #undef 	INLINE_DEF
 #define INLINE_DEF
diff -Naur src_old/tools/tString.cpp src/tools/tString.cpp
--- src_old/tools/tString.cpp	2006-05-13 16:17:31.000000000 +0200
+++ src/tools/tString.cpp	2008-09-27 22:54:50.000000000 +0200
@@ -30,7 +30,7 @@
 #include "tLocale.h"
 #include "tConfiguration.h"
 #include <ctype.h>
-#include <string>
+#include <cstring>
 #include <iostream>
 
 tString::tString(){
diff -Naur src_old/tron/gAIBase.cpp src/tron/gAIBase.cpp
--- src_old/tron/gAIBase.cpp	2006-06-02 22:38:09.000000000 +0200
+++ src/tron/gAIBase.cpp	2008-09-27 18:33:29.000000000 +0200
@@ -43,6 +43,8 @@
 #include "tRandom.h"
 #include "tRecorder.h"
 #include <stdlib.h>
+#include <memory>
+using namespace std;
 
 #define AI_REACTION          0 
 #define AI_EMERGENCY         1 
diff -Naur src_old/tron/gCycle.cpp src/tron/gCycle.cpp
--- src_old/tron/gCycle.cpp	2006-06-02 22:38:09.000000000 +0200
+++ src/tron/gCycle.cpp	2008-09-27 18:39:02.000000000 +0200
@@ -52,6 +52,8 @@
 #include "tMath.h"
 #include <stdlib.h>
 #include <fstream>
+#include <memory>
+using namespace std;
 
 #ifndef DEDICATED
 #define DONTDOIT
diff -Naur src_old/ui/uInput.cpp src/ui/uInput.cpp
--- src_old/ui/uInput.cpp	2006-05-13 16:17:32.000000000 +0200
+++ src/ui/uInput.cpp	2008-09-27 18:50:12.000000000 +0200
@@ -344,7 +344,7 @@
 //  Menuitem for input selection
 // *****************************************************
 
-static char *keyname(int sym){
+static const char *keyname(int sym){
 #ifndef DEDICATED
     if (sym<=SDLK_LAST)
         return SDL_GetKeyName(static_cast<SDLKey>(sym));