tags 461686 + patch
thanks
Hi,
Attached is the diff for my pretzel 2.0n-2-0.3 NMU.
diff -Nru pretzel-2.0n-2/attr/attrtest.nw pretzel-2.0n-2/attr/attrtest.nw
--- pretzel-2.0n-2/attr/attrtest.nw 1996-12-16 17:45:31.000000000 +0100
+++ pretzel-2.0n-2/attr/attrtest.nw 2008-03-09 19:14:51.000000000 +0100
@@ -30,7 +30,7 @@
#include"attr.h"
#include"output.h"
-#include<iostream.h>
+#include<iostream>
int main()
{
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/contrib/aj/gcl.l /tmp/tlZIYJGy2R/pretzel-2.0n-2/contrib/aj/gcl.l
--- pretzel-2.0n-2/contrib/aj/gcl.l 1998-06-11 15:15:25.000000000 +0200
+++ pretzel-2.0n-2/contrib/aj/gcl.l 2008-03-09 19:15:20.000000000 +0100
@@ -6,7 +6,7 @@
%{
/* some needed headers: */
-#include<iostream.h>
+#include<iostream>
#include"attr.h"
/* we'll define yywrap() which is needed for the scanner
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/contrib/aj/gcl.lex.c /tmp/tlZIYJGy2R/pretzel-2.0n-2/contrib/aj/gcl.lex.c
--- pretzel-2.0n-2/contrib/aj/gcl.lex.c 1998-06-11 15:15:27.000000000 +0200
+++ pretzel-2.0n-2/contrib/aj/gcl.lex.c 2008-03-09 19:15:43.000000000 +0100
@@ -440,7 +440,7 @@
#line 7 "gcl.l"
/* some needed headers: */
-#include<iostream.h>
+#include<iostream>
#include"attr.h"
/* we'll define yywrap() which is needed for the scanner
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/contrib/noweb/cee.html/prettycee2html.nw /tmp/tlZIYJGy2R/pretzel-2.0n-2/contrib/noweb/cee.html/prettycee2html.nw
--- pretzel-2.0n-2/contrib/noweb/cee.html/prettycee2html.nw 1996-12-16 19:55:11.000000000 +0100
+++ pretzel-2.0n-2/contrib/noweb/cee.html/prettycee2html.nw 2008-03-09 19:16:04.000000000 +0100
@@ -111,7 +111,7 @@
\begin{verbatim}
// abstract base class of prettyprinter:
- #include<iostream.h>
+ #include<iostream>
#include"attr.h"
#include"output.h"
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/contrib/noweb/general/nowebpretzelpp.nw /tmp/tlZIYJGy2R/pretzel-2.0n-2/contrib/noweb/general/nowebpretzelpp.nw
--- pretzel-2.0n-2/contrib/noweb/general/nowebpretzelpp.nw 2004-08-21 19:10:55.000000000 +0200
+++ pretzel-2.0n-2/contrib/noweb/general/nowebpretzelpp.nw 2008-03-09 19:17:24.000000000 +0100
@@ -104,7 +104,7 @@
\begin{verbatim}
// abstract base class of prettyprinter:
- #include<iostream.h>
+ #include<iostream>
#include"attr.h"
#include"output.h"
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/debian/changelog /tmp/tlZIYJGy2R/pretzel-2.0n-2/debian/changelog
--- pretzel-2.0n-2/debian/changelog 2008-01-22 22:05:32.000000000 +0100
+++ pretzel-2.0n-2/debian/changelog 2008-03-09 18:44:51.000000000 +0100
@@ -1,3 +1,10 @@
+pretzel (2.0n-2-0.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with GCC 4.3 (Closes: #461686).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sun, 09 Mar 2008 17:44:25 +0000
+
pretzel (2.0n-2-0.2) unstable; urgency=low
* NMU
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/debian/rules /tmp/tlZIYJGy2R/pretzel-2.0n-2/debian/rules
--- pretzel-2.0n-2/debian/rules 2008-01-22 22:05:00.000000000 +0100
+++ pretzel-2.0n-2/debian/rules 2008-03-09 19:33:04.000000000 +0100
@@ -46,6 +46,7 @@
$(MAKE) install DESTDIR=`pwd`/debian/tmp
cp doc/pretzelbook/pretzelbook.dvi debian/tmp/usr/share/doc/pretzel/
+ mkdir -p $(DST)/usr/share/doc/pretzel/examples/simpas
cp -a languages/examples $(DST)/usr/share/doc/pretzel/examples/simpas
cp -a languages/cee $(DST)/usr/share/doc/pretzel/examples/
cp -a languages/cplusplus $(DST)/usr/share/doc/pretzel/examples/
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/doc/pretzelbook/pretzelbook.tex /tmp/tlZIYJGy2R/pretzel-2.0n-2/doc/pretzelbook/pretzelbook.tex
--- pretzel-2.0n-2/doc/pretzelbook/pretzelbook.tex 1998-06-11 14:53:39.000000000 +0200
+++ pretzel-2.0n-2/doc/pretzelbook/pretzelbook.tex 2008-03-09 19:18:04.000000000 +0100
@@ -1839,7 +1839,7 @@
% why isn't this prettyprinted? XXX
%
\begin{verbatim}
-#include<iostream.h>
+#include<iostream>
#include"attr.h"
class Pscan {
@@ -1927,7 +1927,7 @@
[EMAIL PROTECTED] class}
%
\begin{verbatim}
-#include<iostream.h>
+#include<iostream>
#include"attr.h"
#include"output.h"
@@ -2027,7 +2027,7 @@
like this:
%
\begin{verbatim}
-#include <iostream.h>
+#include <iostream>
#include "Ppparse.h"
int main () {
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/doc/project.report/chap2.tex /tmp/tlZIYJGy2R/pretzel-2.0n-2/doc/project.report/chap2.tex
--- pretzel-2.0n-2/doc/project.report/chap2.tex 1996-12-13 19:43:01.000000000 +0100
+++ pretzel-2.0n-2/doc/project.report/chap2.tex 2008-03-09 19:18:23.000000000 +0100
@@ -665,7 +665,7 @@
* a minimal main program to test a pretzel prettyprinter
*/
-#include <iostream.h>
+#include <iostream>
#include "pparse.h" // include the header of the prettyprinter
int main () {
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/doc/project.report/slides.tex /tmp/tlZIYJGy2R/pretzel-2.0n-2/doc/project.report/slides.tex
--- pretzel-2.0n-2/doc/project.report/slides.tex 1996-12-13 19:44:23.000000000 +0100
+++ pretzel-2.0n-2/doc/project.report/slides.tex 2008-03-09 19:18:39.000000000 +0100
@@ -454,7 +454,7 @@
Simples Hauptprogramm:
\begin{verbatim}
- #include <iostream.h>
+ #include <iostream>
#include "pparse.h"
int main () {
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/fgrammar/fgrammar.nw /tmp/tlZIYJGy2R/pretzel-2.0n-2/fgrammar/fgrammar.nw
--- pretzel-2.0n-2/fgrammar/fgrammar.nw 1996-03-21 09:13:58.000000000 +0100
+++ pretzel-2.0n-2/fgrammar/fgrammar.nw 2008-03-09 19:19:15.000000000 +0100
@@ -43,10 +43,12 @@
and look whether the output makes sense.
<<implementation>>=
-#include<iostream.h>
-#include<fstream.h>
+#include<iostream>
+#include<fstream>
#include<stdio.h>
+using namespace std;
+
#include"fgparse.h"
int
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/fgrammar/fgscan.nw /tmp/tlZIYJGy2R/pretzel-2.0n-2/fgrammar/fgscan.nw
--- pretzel-2.0n-2/fgrammar/fgscan.nw 1996-09-12 20:44:36.000000000 +0200
+++ pretzel-2.0n-2/fgrammar/fgscan.nw 2008-03-09 19:19:41.000000000 +0100
@@ -137,7 +137,9 @@
<<Header files to include in the specification>>=
#include"attr.h" /* the Attribute class */
-#include<iostream.h>
+#include<iostream>
+
+using namespace std;
@
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/ftokens/ftokens.nw /tmp/tlZIYJGy2R/pretzel-2.0n-2/ftokens/ftokens.nw
--- pretzel-2.0n-2/ftokens/ftokens.nw 2004-08-21 19:10:55.000000000 +0200
+++ pretzel-2.0n-2/ftokens/ftokens.nw 2008-03-09 19:20:09.000000000 +0100
@@ -44,11 +44,13 @@
<<implementation>>=
-#include<iostream.h>
-#include<fstream.h>
+#include<iostream>
+#include<fstream>
#include<stdio.h>
#include<stdlib.h>
+using namespace std;
+
#include"ftparse.h"
//extern int yydebug;
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/ftokens/ftparse.nw /tmp/tlZIYJGy2R/pretzel-2.0n-2/ftokens/ftparse.nw
--- pretzel-2.0n-2/ftokens/ftparse.nw 2004-08-21 19:10:55.000000000 +0200
+++ pretzel-2.0n-2/ftokens/ftparse.nw 2008-03-09 19:20:43.000000000 +0100
@@ -147,7 +147,7 @@
These are the header files needed.
<<Header files to include in the specification>>=
-#include <iostream.h>
+#include <iostream>
@
@@ -372,7 +372,7 @@
\label{pretscanspecs}
<<abstract base class for [[Pscan]]>>=
-#include<iostream.h>
+#include<iostream>
#include"attr.h"
class Pscan {
@@ -576,7 +576,7 @@
<<contents of [[initial_lines]]>>=
"%{ \n\n",
" /* some needed headers: */ \n",
- "#include<iostream.h> \n",
+ "#include<iostream> \n",
"#include\"attr.h\" \n\n",
" /* we'll define yywrap() which is needed for the scanner\n",
" * here, so we won't have to bother about it if we're \n",
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/ftokens/ftscan.nw /tmp/tlZIYJGy2R/pretzel-2.0n-2/ftokens/ftscan.nw
--- pretzel-2.0n-2/ftokens/ftscan.nw 1996-12-16 18:32:04.000000000 +0100
+++ pretzel-2.0n-2/ftokens/ftscan.nw 2008-03-09 19:20:57.000000000 +0100
@@ -134,7 +134,7 @@
<<Header files to include in the specification>>=
#include"attr.h" /* the Attribute class */
-#include<iostream.h>
+#include<iostream>
@
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/ftokens/test.output.correct /tmp/tlZIYJGy2R/pretzel-2.0n-2/ftokens/test.output.correct
--- pretzel-2.0n-2/ftokens/test.output.correct 1998-06-11 12:52:13.000000000 +0200
+++ pretzel-2.0n-2/ftokens/test.output.correct 2008-03-09 19:21:14.000000000 +0100
@@ -6,7 +6,7 @@
%{
/* some needed headers: */
-#include<iostream.h>
+#include<iostream>
#include"attr.h"
/* we'll define yywrap() which is needed for the scanner
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/languages/pascal/multiple.nw /tmp/tlZIYJGy2R/pretzel-2.0n-2/languages/pascal/multiple.nw
--- pretzel-2.0n-2/languages/pascal/multiple.nw 1996-12-17 08:56:46.000000000 +0100
+++ pretzel-2.0n-2/languages/pascal/multiple.nw 2008-03-09 19:21:50.000000000 +0100
@@ -30,7 +30,7 @@
\begin{verbatim}
// abstract base class of prettyprinter:
- #include<iostream.h>
+ #include<iostream>
#include"attr.h"
#include"output.h"
@@ -135,8 +135,8 @@
@
<<Header files to include>>=
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <assert.h>
@
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/main/pascal.correct.l /tmp/tlZIYJGy2R/pretzel-2.0n-2/main/pascal.correct.l
--- pretzel-2.0n-2/main/pascal.correct.l 2004-08-21 19:10:55.000000000 +0200
+++ pretzel-2.0n-2/main/pascal.correct.l 2008-03-09 19:22:09.000000000 +0100
@@ -6,7 +6,7 @@
%{
/* some needed headers: */
-#include<iostream.h>
+#include<iostream>
#include"attr.h"
/* we'll define yywrap() which is needed for the scanner
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/main/plaindpp.c /tmp/tlZIYJGy2R/pretzel-2.0n-2/main/plaindpp.c
--- pretzel-2.0n-2/main/plaindpp.c 1996-12-16 18:33:42.000000000 +0100
+++ pretzel-2.0n-2/main/plaindpp.c 2008-03-09 19:22:27.000000000 +0100
@@ -6,7 +6,7 @@
* (this one turns the debugging features on by default)
*/
-#include <iostream.h>
+#include <iostream>
#include "Ppparse.h"
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/main/plainpp.c /tmp/tlZIYJGy2R/pretzel-2.0n-2/main/plainpp.c
--- pretzel-2.0n-2/main/plainpp.c 1996-12-16 18:33:43.000000000 +0100
+++ pretzel-2.0n-2/main/plainpp.c 2008-03-09 19:22:48.000000000 +0100
@@ -5,7 +5,9 @@
/* a minimal main program for the generated prettyprinter
*/
-#include <iostream.h>
+#include <iostream>
+
+using namespace std;
#include "Ppparse.h"
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/main/pretzel.nw /tmp/tlZIYJGy2R/pretzel-2.0n-2/main/pretzel.nw
--- pretzel-2.0n-2/main/pretzel.nw 1998-02-09 16:49:37.000000000 +0100
+++ pretzel-2.0n-2/main/pretzel.nw 2008-03-09 19:23:34.000000000 +0100
@@ -224,8 +224,11 @@
will be included later.
<<Header files to include>>=
-#include <iostream.h>
+#include <iostream>
#include <stdlib.h>
+
+using namespace std;
+
@
And since some (really old) operating systems don't have the
@@ -451,7 +454,9 @@
@ We need the {\tt fstream.h} header to do this.
<<Header files to include>>=
-#include<fstream.h>
+#include<fstream>
+
+using namespace std;
@ Of course not all of the input and output streams are really used
during every run of the program. For instance there will be no need of
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/man/pretzel.1 /tmp/tlZIYJGy2R/pretzel-2.0n-2/man/pretzel.1
--- pretzel-2.0n-2/man/pretzel.1 1998-06-11 15:56:22.000000000 +0200
+++ pretzel-2.0n-2/man/pretzel.1 2008-03-09 19:24:02.000000000 +0100
@@ -567,7 +567,7 @@
.RS
.B
-#include<iostream.h>
+#include<iostream>
.PP
.B
#include"attr.h"
@@ -648,7 +648,7 @@
in the pretzel include directory):
.RS
-.B #include<iostream.h>
+.B #include<iostream>
.B #include"attr.h"
.B class Pscan {
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/output/output.nw /tmp/tlZIYJGy2R/pretzel-2.0n-2/output/output.nw
--- pretzel-2.0n-2/output/output.nw 2004-08-21 19:10:55.000000000 +0200
+++ pretzel-2.0n-2/output/output.nw 2008-03-09 18:45:21.000000000 +0100
@@ -647,7 +647,9 @@
specification.
<<Header files to include in the specification>>=
-#include<iostream.h>
+#include<iostream>
+
+using namespace std;
@
diff -Nru /tmp/SGAt8Ya0oV/pretzel-2.0n-2/output/outtest.nw /tmp/tlZIYJGy2R/pretzel-2.0n-2/output/outtest.nw
--- pretzel-2.0n-2/output/outtest.nw 1996-12-16 18:27:08.000000000 +0100
+++ pretzel-2.0n-2/output/outtest.nw 2008-03-09 19:24:48.000000000 +0100
@@ -34,7 +34,10 @@
times: First in normal mode and then in debug mode.
<<implementation>>=
-#include<iostream.h>
+#include<iostream>
+
+using namespace std;
+
#include"output.h"
<<Global variables>>
