You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
272 lines
5.4 KiB
272 lines
5.4 KiB
14 years ago
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# Filename: package/.../docpp/docpp-3.4.10-gcc43.patch
|
||
|
|
# Copyright (C) 2011 The OpenSDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
Description: Fix to build with GCC >= 4.3
|
||
|
|
Origin: Gentoo
|
||
|
|
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-doc/doc%2B%2B/files/doc%2B%2B-3.4.10-gcc43.patch?revision=1.1
|
||
|
|
|
||
|
|
Bug reference: http://bugs.gentoo.org/show_bug.cgi?id=227067
|
||
|
|
|
||
|
|
--- 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/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/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/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/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/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/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/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/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/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/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/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/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"
|
||
|
|
|
||
|
|
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"
|