[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#147925: Patches for deprecated C++ headers

tags 147925 patch

Please see the attached file for a full set of patches to avoid using
the deprecated C++ headers.
-- 
***************************************************************************
Joel Baker                           System Administrator - lightbearer.com
lucifer@lightbearer.com              http://users.lightbearer.com/lucifer/

diff -ur apt-0.5.4.orig/apt-inst/contrib/extracttar.cc apt-0.5.4/apt-inst/contrib/extracttar.cc
--- apt-0.5.4.orig/apt-inst/contrib/extracttar.cc	2002-09-23 04:59:49.000000000 +0000
+++ apt-0.5.4/apt-inst/contrib/extracttar.cc	2002-09-23 05:00:16.000000000 +0000
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
-#include <iostream.h>
+#include <iostream>
 									/*}}}*/
 using namespace std;
 
diff -ur apt-0.5.4.orig/apt-inst/contrib/extracttar.cc.orig apt-0.5.4/apt-inst/contrib/extracttar.cc.orig
--- apt-0.5.4.orig/apt-inst/contrib/extracttar.cc.orig	2002-09-23 04:59:39.000000000 +0000
+++ apt-0.5.4/apt-inst/contrib/extracttar.cc.orig	2002-09-23 04:59:49.000000000 +0000
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
-#include <iostream>
+#include <iostream.h>
 									/*}}}*/
 using namespace std;
 
diff -ur apt-0.5.4.orig/apt-inst/deb/dpkgdb.cc apt-0.5.4/apt-inst/deb/dpkgdb.cc
--- apt-0.5.4.orig/apt-inst/deb/dpkgdb.cc	2002-09-23 04:59:49.000000000 +0000
+++ apt-0.5.4/apt-inst/deb/dpkgdb.cc	2002-09-23 05:00:16.000000000 +0000
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <ctype.h>
-#include <iostream.h>
+#include <iostream>
 									/*}}}*/
 using namespace std;
 
diff -ur apt-0.5.4.orig/apt-inst/deb/dpkgdb.cc.orig apt-0.5.4/apt-inst/deb/dpkgdb.cc.orig
--- apt-0.5.4.orig/apt-inst/deb/dpkgdb.cc.orig	2002-09-23 04:59:39.000000000 +0000
+++ apt-0.5.4/apt-inst/deb/dpkgdb.cc.orig	2002-09-23 04:59:49.000000000 +0000
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <ctype.h>
-#include <iostream>
+#include <iostream.h>
 									/*}}}*/
 using namespace std;
 
diff -ur apt-0.5.4.orig/apt-inst/extract.cc apt-0.5.4/apt-inst/extract.cc
--- apt-0.5.4.orig/apt-inst/extract.cc	2002-09-23 04:59:49.000000000 +0000
+++ apt-0.5.4/apt-inst/extract.cc	2002-09-23 05:00:16.000000000 +0000
@@ -56,7 +56,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <dirent.h>
-#include <iostream.h>
+#include <iostream>
 									/*}}}*/
 using namespace std;
 
diff -ur apt-0.5.4.orig/apt-inst/extract.cc.orig apt-0.5.4/apt-inst/extract.cc.orig
--- apt-0.5.4.orig/apt-inst/extract.cc.orig	2002-09-23 04:59:39.000000000 +0000
+++ apt-0.5.4/apt-inst/extract.cc.orig	2002-09-23 04:59:49.000000000 +0000
@@ -56,7 +56,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <dirent.h>
-#include <iostream>
+#include <iostream.h>
 									/*}}}*/
 using namespace std;
 
diff -ur apt-0.5.4.orig/apt-pkg/algorithms.cc apt-0.5.4/apt-pkg/algorithms.cc
--- apt-0.5.4.orig/apt-pkg/algorithms.cc	2002-09-23 04:59:49.000000000 +0000
+++ apt-0.5.4/apt-pkg/algorithms.cc	2002-09-23 05:00:16.000000000 +0000
@@ -24,7 +24,7 @@
     
 #include <apti18n.h>
     
-#include <iostream.h>
+#include <iostream>
 									/*}}}*/
 using namespace std;
 
diff -ur apt-0.5.4.orig/apt-pkg/algorithms.cc.orig apt-0.5.4/apt-pkg/algorithms.cc.orig
--- apt-0.5.4.orig/apt-pkg/algorithms.cc.orig	2002-09-23 04:59:39.000000000 +0000
+++ apt-0.5.4/apt-pkg/algorithms.cc.orig	2002-09-23 04:59:49.000000000 +0000
@@ -24,7 +24,7 @@
     
 #include <apti18n.h>
     
-#include <iostream>
+#include <iostream.h>
 									/*}}}*/
 using namespace std;
 
diff -ur apt-0.5.4.orig/apt-pkg/contrib/error.cc apt-0.5.4/apt-pkg/contrib/error.cc
--- apt-0.5.4.orig/apt-pkg/contrib/error.cc	2002-09-23 04:59:49.000000000 +0000
+++ apt-0.5.4/apt-pkg/contrib/error.cc	2002-09-23 05:00:16.000000000 +0000
@@ -20,7 +20,7 @@
 
 #include <apt-pkg/error.h>
 
-#include <iostream.h>
+#include <iostream>
 #include <errno.h>
 #include <stdio.h>
 #include <string>
diff -ur apt-0.5.4.orig/apt-pkg/pkgsystem.h apt-0.5.4/apt-pkg/pkgsystem.h
--- apt-0.5.4.orig/apt-pkg/pkgsystem.h	2002-09-23 04:59:49.000000000 +0000
+++ apt-0.5.4/apt-pkg/pkgsystem.h	2002-09-23 05:00:16.000000000 +0000
@@ -42,7 +42,7 @@
 #endif
 
 #include <apt-pkg/depcache.h>
-#include <vector.h>
+#include <vector>
     
 using namespace std;
     
diff -ur apt-0.5.4.orig/apt-pkg/pkgsystem.h.orig apt-0.5.4/apt-pkg/pkgsystem.h.orig
--- apt-0.5.4.orig/apt-pkg/pkgsystem.h.orig	2002-09-23 04:59:39.000000000 +0000
+++ apt-0.5.4/apt-pkg/pkgsystem.h.orig	2002-09-23 04:59:49.000000000 +0000
@@ -42,7 +42,7 @@
 #endif
 
 #include <apt-pkg/depcache.h>
-#include <vector>
+#include <vector.h>
     
 using namespace std;
     
diff -ur apt-0.5.4.orig/apt-pkg/sourcelist.cc apt-0.5.4/apt-pkg/sourcelist.cc
--- apt-0.5.4.orig/apt-pkg/sourcelist.cc	2002-09-23 04:59:49.000000000 +0000
+++ apt-0.5.4/apt-pkg/sourcelist.cc	2002-09-23 05:00:16.000000000 +0000
@@ -20,7 +20,7 @@
 
 #include <apti18n.h>
 
-#include <fstream.h>
+#include <fstream>
 									/*}}}*/
 
 using namespace std;
diff -ur apt-0.5.4.orig/cmdline/apt-cache.cc apt-0.5.4/cmdline/apt-cache.cc
--- apt-0.5.4.orig/cmdline/apt-cache.cc	2002-09-23 04:59:49.000000000 +0000
+++ apt-0.5.4/cmdline/apt-cache.cc	2002-09-23 05:00:16.000000000 +0000
@@ -31,7 +31,7 @@
 #include <config.h>
 #include <apti18n.h>
 
-#include <iostream.h>
+#include <iostream>
 #include <unistd.h>
 #include <errno.h>
 #include <regex.h>
diff -ur apt-0.5.4.orig/cmdline/apt-get.cc apt-0.5.4/cmdline/apt-get.cc
--- apt-0.5.4.orig/cmdline/apt-get.cc	2002-09-23 04:59:49.000000000 +0000
+++ apt-0.5.4/cmdline/apt-get.cc	2002-09-23 05:00:16.000000000 +0000
@@ -45,7 +45,7 @@
 
 #include "acqprogress.h"
 
-#include <fstream.h>
+#include <fstream>
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
diff -ur apt-0.5.4.orig/cmdline/indexcopy.cc apt-0.5.4/cmdline/indexcopy.cc
--- apt-0.5.4.orig/cmdline/indexcopy.cc	2002-09-23 04:59:49.000000000 +0000
+++ apt-0.5.4/cmdline/indexcopy.cc	2002-09-23 05:00:16.000000000 +0000
@@ -19,7 +19,7 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/tagfile.h>
 
-#include <iostream.h>
+#include <iostream>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdio.h>
diff -ur apt-0.5.4.orig/test/versiontest.cc apt-0.5.4/test/versiontest.cc
--- apt-0.5.4.orig/test/versiontest.cc	2002-09-23 04:59:49.000000000 +0000
+++ apt-0.5.4/test/versiontest.cc	2002-09-23 05:00:16.000000000 +0000
@@ -18,8 +18,8 @@
 #include <system.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/version.h>
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 
   static int verrevcmp(const char *val, const char *ref) 
 {

Attachment: pgpPYYgTC8Ubo.pgp
Description: PGP signature

Reply to: