View | Details | Raw Unified | Return to bug 196652 | Differences between
and this patch

Collapse All | Expand All

(-)games/xmoto/files/patch-src-GameInit.cpp (+11 lines)
Line 0 Link Here
1 
--- src/GameInit.cpp.orig	2015-01-10 18:22:36.000000000 +0100
2 
+++ src/GameInit.cpp	2015-01-10 18:27:28.000000000 +0100
3 
@@ -248,7 +248,7 @@ void GameApp::run_load(int nNumArgs, cha
4 
   Logger::setActiv(XMSession::instance()->noLog() == false); /* apply log activ mode */
5
6 
   LogInfo(std::string("X-Moto " + XMBuild::getVersionString(true)).c_str());
7 
-  LogInfo("compiled at "__DATE__" "__TIME__);
8 
+  LogInfo("compiled at " __DATE__ " " __TIME__);
9 
   if(SwapEndian::bigendien) {
10 
     LogInfo("Systeme is bigendien");
11 
   } else {
(-)games/xmoto/files/patch-src-VTexture.h (-11 lines)
Lines 1-11 Link Here
1 
--- src/VTexture.h.orig	2011-10-12 00:18:35.000000000 +0400
2 
+++ src/VTexture.h	2014-11-24 22:08:42.749026473 +0300
3 
@@ -135,7 +135,7 @@
4
5 
   void cleanUnregistredTextures();
6
7 
-  HashNamespace::hash_map<const char*, int*, HashNamespace::hash<const char*>, hashcmp_str> m_textureSizeCache;
8 
+  HashNamespace::hash_map<std::string, int*> m_textureSizeCache;
9 
   std::vector<std::string> m_textureSizeCacheKeys;
10 
   std::vector<int*> m_textureSizeCacheValues;
11
(-)games/xmoto/files/patch-src-WWW.cpp (+47 lines)
Line 0 Link Here
1 
--- src/WWW.cpp.orig	2015-01-10 18:11:22.000000000 +0100
2 
+++ src/WWW.cpp	2015-01-10 18:21:32.000000000 +0100
3 
@@ -206,7 +206,7 @@ void FSWeb::downloadFile(const std::stri
4 
   std::string v_www_agent = WWW_AGENT;
5
6 
   /* open the file */
7 
-  if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == false) {
8 
+  if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == NULL) {
9 
     throw Exception("error : unable to open output file "
10 
         + v_local_file_tmp);
11 
   }
12 
@@ -320,7 +320,7 @@ void FSWeb::uploadReplay(const std::stri
13 
   LogInfo(std::string("Uploading replay " + p_replayFilename).c_str());
14
15 
   /* open the file */
16 
-  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
17 
+  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) {
18 
     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("UR"));
19 
   }
20
21 
@@ -478,7 +478,7 @@ void FSWeb::sendVote(const std::string&
22 
   LogInfo("Sending vote");
23
24 
   /* open the file */
25 
-  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
26 
+  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) {
27 
     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SV"));
28 
   }
29
30 
@@ -562,7 +562,7 @@ void FSWeb::sendReport(const std::string
31 
   LogInfo("Sending report");
32
33 
   /* open the file */
34 
-  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
35 
+  if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) {
36 
     throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SR"));
37 
   }
38
39 
@@ -677,7 +677,7 @@ void FSWeb::uploadDbSync(const std::stri
40 
   LogInfo(std::string("Uploading dbsync " + p_dbSyncFilename + " to " + p_url_to_transfert).c_str());
41
42 
   /* open the file */
43 
-  if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == false) {
44 
+  if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == NULL) {
45 
     throw Exception("error : unable to open output file " + p_answerFile);
46 
   }
47
(-)games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp (-34 lines)
Lines 1-34 Link Here
1 
--- src/drawlib/DrawLibOpenGL.cpp.orig	2011-10-12 00:18:26.000000000 +0400
2 
+++ src/drawlib/DrawLibOpenGL.cpp	2014-11-24 22:08:12.925973647 +0300
3 
@@ -80,7 +80,7 @@
4 
   /* a glyph from other glyphs */
5 
   /*kejo:why not just grrr create a copy contructor*/
6 
   GLFontGlyph(const std::string& i_value,
7 
-	      HashNamespace::hash_map<const char*, GLFontGlyphLetter*, HashNamespace::hash<const char*>, hashcmp_str>& i_glyphsLetters);
8 
+	      HashNamespace::hash_map<std::string, GLFontGlyphLetter*>& i_glyphsLetters);
9 
   virtual ~GLFontGlyph();
10
11 
   std::string Value() const;
12 
@@ -132,11 +132,11 @@
13 
 private:
14 
   std::vector<std::string> m_glyphsKeys;
15 
   std::vector<GLFontGlyph*> m_glyphsValues;
16 
-  HashNamespace::hash_map<const char*, GLFontGlyph*, HashNamespace::hash<const char*>, hashcmp_str> m_glyphs;
17 
+  HashNamespace::hash_map<std::string, GLFontGlyph*> m_glyphs;
18
19 
   std::vector<std::string> m_glyphsLettersKeys;
20 
   std::vector<GLFontGlyphLetter*> m_glyphsLettersValues;
21 
-  HashNamespace::hash_map<const char*, GLFontGlyphLetter*, HashNamespace::hash<const char*>, hashcmp_str> m_glyphsLetters;
22 
+  HashNamespace::hash_map<std::string, GLFontGlyphLetter*> m_glyphsLetters;
23
24 
   unsigned int getLonguestLineSize(const std::string& i_value, unsigned int i_start = 0, unsigned int i_nbLinesToRead = -1);
25 
 };
26 
@@ -825,7 +825,7 @@
27 
 }
28
29 
 GLFontGlyph::GLFontGlyph(const std::string& i_value,
30 
-			 HashNamespace::hash_map<const char*, GLFontGlyphLetter*, HashNamespace::hash<const char*>, hashcmp_str>& i_glyphsLetters) {
31 
+			 HashNamespace::hash_map<std::string, GLFontGlyphLetter*>& i_glyphsLetters) {
32 
   GLFontGlyph* v_glyph;
33 
   std::string  v_char;
34

Return to bug 196652