HCoop / jackhill / guix / guix.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
gnu: emacs-consult: Fix grammar.
[jackhill/guix/guix.git] / gnu / packages / patches / ri-li-modernize_cpp.patch
CommitLineData
3745909d
NG		 1diff -r -u Ri-li-2.0.1.orig/src/audio.cc Ri-li-2.0.1/src/audio.cc
2--- Ri-li-2.0.1.orig/src/audio.cc 2012-01-22 00:40:56.928609371 -0800
3+++ Ri-li-2.0.1/src/audio.cc 2012-01-22 00:28:33.360636539 -0800
4@@ -22,8 +22,8 @@
5 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
6
7 #include <stdlib.h>
8-#include <iostream.h>
9-#include <string.h>
10+#include <iostream>
11+#include <string>
12
13 #include "audio.h"
14 #include "utils.h"
15@@ -57,7 +57,7 @@
16 char PathFile[512];
17
18 if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) {
19- cerr <<"Enable to init Sound card ! "<<SDL_GetError()<<endl;
20+ std::cerr <<"Enable to init Sound card ! "<<SDL_GetError()<<std::endl;
21 return false;
22 }
23
24diff -r -u Ri-li-2.0.1.orig/src/ecran.cc Ri-li-2.0.1/src/ecran.cc
25--- Ri-li-2.0.1.orig/src/ecran.cc 2007-11-02 04:48:16.000000000 -0700
26+++ Ri-li-2.0.1/src/ecran.cc 2012-01-22 00:13:54.422798653 -0800
27@@ -21,7 +21,7 @@
28 // with this program; if not, write to the Free Software Foundation, Inc.,
29 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
30
31-#include <iostream.h>
32+#include <iostream>
33 #include <stdio.h>
34 #include <stdlib.h>
35 #include <math.h>
36diff -r -u Ri-li-2.0.1.orig/src/editeur.cc Ri-li-2.0.1/src/editeur.cc
37--- Ri-li-2.0.1.orig/src/editeur.cc 2007-11-02 04:48:17.000000000 -0700
38+++ Ri-li-2.0.1/src/editeur.cc 2012-01-22 00:28:59.632635579 -0800
39@@ -25,10 +25,10 @@
40 #include <windows.h>
41 #endif
42
43-#include <iostream.h>
44+#include <iostream>
45 #include <stdio.h>
46 #include <stdlib.h>
47-#include <string.h>
48+#include <string>
49 #include <math.h>
50 #include <SDL/SDL.h>
51
52@@ -374,7 +374,7 @@
53
54 // Sauve le niveau
55 if(Niveau.Save()==false) {
56- cerr <<"ERREUR Saving levels!"<<endl;
57+ std::cerr <<"ERREUR Saving levels!"<<std::endl;
58 exit(-1);
59 }
60
61diff -r -u Ri-li-2.0.1.orig/src/jeux.cc Ri-li-2.0.1/src/jeux.cc
62--- Ri-li-2.0.1.orig/src/jeux.cc 2007-11-02 04:48:17.000000000 -0700
63+++ Ri-li-2.0.1/src/jeux.cc 2012-01-22 00:14:08.422798143 -0800
64@@ -25,10 +25,10 @@
65 #include <windows.h>
66 #endif
67
68-#include <iostream.h>
69+#include <iostream>
70 #include <stdio.h>
71 #include <stdlib.h>
72-#include <string.h>
73+#include <string>
74 #include <math.h>
75 #include <SDL/SDL.h>
76
77diff -r -u Ri-li-2.0.1.orig/src/loco.cc Ri-li-2.0.1/src/loco.cc
78--- Ri-li-2.0.1.orig/src/loco.cc 2007-11-02 04:48:18.000000000 -0700
79+++ Ri-li-2.0.1/src/loco.cc 2012-01-22 00:14:17.878797797 -0800
80@@ -21,10 +21,10 @@
81 // with this program; if not, write to the Free Software Foundation, Inc.,
82 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
83
84-#include <iostream.h>
85+#include <iostream>
86 #include <stdio.h>
87 #include <stdlib.h>
88-#include <string.h>
89+#include <string>
90 #include <math.h>
91 #include "preference.h"
92 #include "loco.h"
93diff -r -u Ri-li-2.0.1.orig/src/main.cc Ri-li-2.0.1/src/main.cc
94--- Ri-li-2.0.1.orig/src/main.cc 2007-11-02 04:48:19.000000000 -0700
95+++ Ri-li-2.0.1/src/main.cc 2012-01-22 00:29:40.080634136 -0800
96@@ -23,8 +23,8 @@
97
98 #include <stdio.h>
99 #include <stdlib.h>
100-#include <iostream.h>
101-#include <string.h>
102+#include <iostream>
103+#include <string>
104 #include <SDL/SDL.h>
105 #include <SDL/SDL_mixer.h>
106
107@@ -115,7 +115,7 @@
108
109 // Initilise SDL
110 if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) {
111- cerr <<"Impossible d'initialiser SDL:"<<SDL_GetError()<<endl;
112+ std::cerr <<"Impossible d'initialiser SDL:"<<SDL_GetError()<<std::endl;
113 exit(-1);
114 }
115 // Ferme le programme correctement quant quit
116@@ -125,7 +125,7 @@
117 sdlVideoInfo=(SDL_VideoInfo*)SDL_GetVideoInfo();
118
119 if(sdlVideoInfo->vfmt->BitsPerPixel==8) {
120