tags 461715 + patch
thanks
Hi,
Attached is the diff for my doc++ 3.4.10-3.5 NMU.
diff -u doc++-3.4.10/debian/changelog doc++-3.4.10/debian/changelog
--- doc++-3.4.10/debian/changelog
+++ doc++-3.4.10/debian/changelog
@@ -1,3 +1,10 @@
+doc++ (3.4.10-3.5) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with GCC 4.3 (Closes: #461715).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sun, 09 Mar 2008 16:33:06 +0000
+
doc++ (3.4.10-3.4) unstable; urgency=low
* NMU as part of the GCC 4.1 transition.
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/nametable.cc
+++ doc++-3.4.10/src/nametable.cc
@@ -22,7 +22,7 @@
*/
#include <assert.h>
-#include <iostream.h>
+#include <iostream>
#include <stdlib.h>
#include <string.h>
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/doc2tex.ll
+++ doc++-3.4.10/src/doc2tex.ll
@@ -23,13 +23,15 @@
%{
#include <assert.h>
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
+using namespace std;
+
#include "classgraph.h"
#include "doc.h"
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/comment.ll
+++ doc++-3.4.10/src/comment.ll
@@ -24,7 +24,7 @@
#include <assert.h>
#include <ctype.h>
-#include <iostream.h>
+#include <iostream>
#include <stdarg.h>
#include <stdio.h>
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/nametable.h
+++ doc++-3.4.10/src/nametable.h
@@ -25,7 +25,9 @@
#define _NAME_TABLE_H
#include <assert.h>
-#include <iostream.h>
+#include <iostream>
+
+using namespace std;
#include "datahashtable.h"
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/html.cc
+++ doc++-3.4.10/src/html.cc
@@ -31,7 +31,7 @@
#include <direct.h>
#endif
#include <errno.h>
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/equate.cc
+++ doc++-3.4.10/src/equate.cc
@@ -23,9 +23,9 @@
#include "config.h"
-#include <fstream.h>
+#include <fstream>
#include <getopt.h>
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include <string.h>
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/php.ll
+++ doc++-3.4.10/src/php.ll
@@ -23,7 +23,7 @@
%{
#include <assert.h>
#include <ctype.h>
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include "doc.h"
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/tex2gif.cc
+++ doc++-3.4.10/src/tex2gif.cc
@@ -21,8 +21,8 @@
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
#include <stdio.h>
#include <string.h>
@@ -38,6 +38,8 @@
#include "nametable.h"
#include "tex2gif.h"
+using namespace std;
+
void _system(const char *b)
{
#ifdef DEBUG
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/main.cc
+++ doc++-3.4.10/src/main.cc
@@ -25,7 +25,7 @@
#include "config.h"
#include <assert.h>
-#include <fstream.h>
+#include <fstream>
#include <getopt.h>
#include <locale.h>
#include <stdio.h>
@@ -38,6 +38,8 @@
#define GIF_FILE_NAME "gifs.db"
+using namespace std;
+
FILE *out;
char language;
Entry *root;
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/datahashtable.h
+++ doc++-3.4.10/src/datahashtable.h
@@ -26,9 +26,11 @@
#define _DATAHASHTABLE_H
#include <assert.h>
-#include <iostream.h>
+#include <iostream>
#include <stdlib.h>
+using namespace std;
+
#include "McDArray.h"
/* This should be a private subclass of #DataHashTable#. However, since cfront
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/doc.ll
+++ doc++-3.4.10/src/doc.ll
@@ -23,8 +23,8 @@
%{
#include <assert.h>
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/cpp.ll
+++ doc++-3.4.10/src/cpp.ll
@@ -26,7 +26,7 @@
#include <assert.h>
#include <ctype.h>
-#include <iostream.h>
+#include <iostream>
#include <stdarg.h>
#include <stdio.h>
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/java.ll
+++ doc++-3.4.10/src/java.ll
@@ -26,7 +26,7 @@
#include <assert.h>
#include <ctype.h>
-#include <iostream.h>
+#include <iostream>
#include <stdio.h>
#include "doc.h"
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/doc2dbsgml.ll
+++ doc++-3.4.10/src/doc2dbsgml.ll
@@ -22,12 +22,14 @@
%{
#include <assert.h>
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+using namespace std;
+
#include "classgraph.h"
#include "doc.h"
only in patch2:
unchanged:
--- doc++-3.4.10.orig/src/doc2dbxml.ll
+++ doc++-3.4.10/src/doc2dbxml.ll
@@ -25,12 +25,14 @@
%{
#include <assert.h>
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+using namespace std;
+
#include "classgraph.h"
#include "doc.h"
