Bug#128741: Use correct C++ headers
Package: apt
Version: 0.5.4
Severity: minor
According to the C++ standard, standard library headers are not suffixed
with the extension .h - this patch fixes it in apt.
I'm not sure whether the C headers should be changed to their C++
equivalent as well, eg. <cstdio> instead of <stdio.h>.
- Morten.
? header_patch.diff
? debian/copyright
? debian/shlibs.local
? debian/shlibs.local.apt
? debian/shlibs.local.apt-utils
Index: apt-inst/extract.cc
===================================================================
RCS file: /cvs/deity/apt/apt-inst/extract.cc,v
retrieving revision 1.3
diff -u -r1.3 extract.cc
--- apt-inst/extract.cc 2001/05/27 23:47:14 1.3
+++ apt-inst/extract.cc 2002/01/11 13:50:22
@@ -56,7 +56,7 @@
#include <unistd.h>
#include <errno.h>
#include <dirent.h>
-#include <iostream.h>
+#include <iostream>
/*}}}*/
static const char *TempExt = "dpkg-tmp";
Index: apt-inst/contrib/extracttar.cc
===================================================================
RCS file: /cvs/deity/apt/apt-inst/contrib/extracttar.cc,v
retrieving revision 1.4
diff -u -r1.4 extracttar.cc
--- apt-inst/contrib/extracttar.cc 2001/09/30 04:06:59 1.4
+++ apt-inst/contrib/extracttar.cc 2002/01/11 13:50:23
@@ -30,7 +30,7 @@
#include <unistd.h>
#include <signal.h>
#include <fcntl.h>
-#include <iostream.h>
+#include <iostream>
/*}}}*/
// The on disk header for a tar file.
Index: apt-inst/deb/dpkgdb.cc
===================================================================
RCS file: /cvs/deity/apt/apt-inst/deb/dpkgdb.cc,v
retrieving revision 1.4
diff -u -r1.4 dpkgdb.cc
--- apt-inst/deb/dpkgdb.cc 2001/05/27 23:50:42 1.4
+++ apt-inst/deb/dpkgdb.cc 2002/01/11 13:50:24
@@ -31,7 +31,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <ctype.h>
-#include <iostream.h>
+#include <iostream>
/*}}}*/
// EraseDir - Erase A Directory /*{{{*/
Index: apt-pkg/algorithms.cc
===================================================================
RCS file: /cvs/deity/apt/apt-pkg/algorithms.cc,v
retrieving revision 1.37
diff -u -r1.37 algorithms.cc
--- apt-pkg/algorithms.cc 2001/12/26 06:47:37 1.37
+++ apt-pkg/algorithms.cc 2002/01/11 13:50:27
@@ -24,7 +24,7 @@
#include <apti18n.h>
-#include <iostream.h>
+#include <iostream>
/*}}}*/
pkgProblemResolver *pkgProblemResolver::This = 0;
Index: apt-pkg/pkgsystem.h
===================================================================
RCS file: /cvs/deity/apt/apt-pkg/pkgsystem.h,v
retrieving revision 1.4
diff -u -r1.4 pkgsystem.h
--- apt-pkg/pkgsystem.h 2001/04/29 05:13:51 1.4
+++ apt-pkg/pkgsystem.h 2002/01/11 13:50:27
@@ -42,7 +42,7 @@
#endif
#include <apt-pkg/depcache.h>
-#include <vector.h>
+#include <vector>
class pkgPackageManager;
class pkgVersioningSystem;
Index: apt-pkg/sourcelist.cc
===================================================================
RCS file: /cvs/deity/apt/apt-pkg/sourcelist.cc,v
retrieving revision 1.20
diff -u -r1.20 sourcelist.cc
--- apt-pkg/sourcelist.cc 2001/05/15 05:46:11 1.20
+++ apt-pkg/sourcelist.cc 2002/01/11 13:50:27
@@ -20,7 +20,7 @@
#include <apti18n.h>
-#include <fstream.h>
+#include <fstream>
/*}}}*/
using namespace std;
Index: apt-pkg/contrib/error.cc
===================================================================
RCS file: /cvs/deity/apt/apt-pkg/contrib/error.cc,v
retrieving revision 1.10
diff -u -r1.10 error.cc
--- apt-pkg/contrib/error.cc 2001/05/07 05:28:44 1.10
+++ apt-pkg/contrib/error.cc 2002/01/11 13:50:28
@@ -20,7 +20,7 @@
#include <apt-pkg/error.h>
-#include <iostream.h>
+#include <iostream>
#include <errno.h>
#include <stdio.h>
#include <string>
Index: cmdline/apt-cache.cc
===================================================================
RCS file: /cvs/deity/apt/cmdline/apt-cache.cc,v
retrieving revision 1.55
diff -u -r1.55 apt-cache.cc
--- cmdline/apt-cache.cc 2002/01/09 04:59:44 1.55
+++ cmdline/apt-cache.cc 2002/01/11 13:50:30
@@ -31,7 +31,7 @@
#include <config.h>
#include <apti18n.h>
-#include <iostream.h>
+#include <iostream>
#include <unistd.h>
#include <errno.h>
#include <regex.h>
Index: cmdline/apt-get.cc
===================================================================
RCS file: /cvs/deity/apt/cmdline/apt-get.cc,v
retrieving revision 1.113
diff -u -r1.113 apt-get.cc
--- cmdline/apt-get.cc 2002/01/09 04:59:44 1.113
+++ cmdline/apt-get.cc 2002/01/11 13:50:34
@@ -45,7 +45,7 @@
#include "acqprogress.h"
-#include <fstream.h>
+#include <fstream>
#include <termios.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
Index: cmdline/indexcopy.cc
===================================================================
RCS file: /cvs/deity/apt/cmdline/indexcopy.cc,v
retrieving revision 1.9
diff -u -r1.9 indexcopy.cc
--- cmdline/indexcopy.cc 2001/08/18 22:20:40 1.9
+++ cmdline/indexcopy.cc 2002/01/11 13:50:35
@@ -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>
Index: test/versiontest.cc
===================================================================
RCS file: /cvs/deity/apt/test/versiontest.cc,v
retrieving revision 1.2
diff -u -r1.2 versiontest.cc
--- test/versiontest.cc 2001/02/20 07:03:18 1.2
+++ test/versiontest.cc 2002/01/11 13:50:36
@@ -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)
{
Reply to: