Use std C++ header names for includes

Author: jgg
Date: 2002-03-26 07:38:57 GMT
Use std C++ header names for includes

12 files changed, 27 insertions, 26 deletions

diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 95869fe4a..e0feaee12 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: extracttar.cc,v 1.4 2001/09/30 04:06:59 jgg Exp $
+// $Id: extracttar.cc,v 1.5 2002/03/26 07:38:58 jgg Exp $
 /* ######################################################################
 
    Extract a Tar - Tar Extractor
@@ -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.
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc
index 047702f50..6c790540c 100644
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: dpkgdb.cc,v 1.4 2001/05/27 23:50:42 jgg Exp $
+// $Id: dpkgdb.cc,v 1.5 2002/03/26 07:38:58 jgg Exp $
 /* ######################################################################
 
    DPKGv1 Database Implemenation
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <ctype.h>
-#include <iostream.h>
+#include <iostream>
 									/*}}}*/
 
 // EraseDir - Erase A Directory						/*{{{*/
diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc
index 5c5ad55b2..d184a5e9d 100644
--- a/apt-inst/extract.cc
+++ b/apt-inst/extract.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: extract.cc,v 1.3 2001/05/27 23:47:14 jgg Exp $
+// $Id: extract.cc,v 1.4 2002/03/26 07:38:57 jgg Exp $
 /* ######################################################################
 
    Archive Extraction Directory Stream
@@ -56,7 +56,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <dirent.h>
-#include <iostream.h>
+#include <iostream>
 									/*}}}*/
 
 static const char *TempExt = "dpkg-tmp";
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 2dd9aaaf1..86ced3057 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: algorithms.cc,v 1.37 2001/12/26 06:47:37 jgg Exp $
+// $Id: algorithms.cc,v 1.38 2002/03/26 07:38:58 jgg Exp $
 /* ######################################################################
 
    Algorithms - A set of misc algorithms
@@ -24,7 +24,7 @@
     
 #include <apti18n.h>
     
-#include <iostream.h>
+#include <iostream>
 									/*}}}*/
 
 pkgProblemResolver *pkgProblemResolver::This = 0;
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 6aa740d29..5fe9bdfce 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: error.cc,v 1.10 2001/05/07 05:28:44 jgg Exp $
+// $Id: error.cc,v 1.11 2002/03/26 07:38:58 jgg Exp $
 /* ######################################################################
    
    Global Erorr Class - Global error mechanism
@@ -20,7 +20,7 @@
 
 #include <apt-pkg/error.h>
 
-#include <iostream.h>
+#include <iostream>
 #include <errno.h>
 #include <stdio.h>
 #include <string>
diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h
index c6b34fd61..54da6fcc1 100644
--- a/apt-pkg/pkgsystem.h
+++ b/apt-pkg/pkgsystem.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: pkgsystem.h,v 1.4 2001/04/29 05:13:51 jgg Exp $
+// $Id: pkgsystem.h,v 1.5 2002/03/26 07:38:58 jgg Exp $
 /* ######################################################################
 
    System - Abstraction for running on different systems.
@@ -42,7 +42,7 @@
 #endif
 
 #include <apt-pkg/depcache.h>
-#include <vector.h>
+#include <vector>
     
 class pkgPackageManager;
 class pkgVersioningSystem;
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index e624bbec8..cb1287623 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: sourcelist.cc,v 1.21 2002/03/20 05:51:20 jgg Exp $
+// $Id: sourcelist.cc,v 1.22 2002/03/26 07:38:58 jgg Exp $
 /* ######################################################################
 
    List of Sources
@@ -20,7 +20,7 @@
 
 #include <apti18n.h>
 
-#include <fstream.h>
+#include <fstream>
 									/*}}}*/
 
 using namespace std;
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index c82964d18..6acb62cc6 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: apt-cache.cc,v 1.57 2002/03/20 05:51:52 jgg Exp $
+// $Id: apt-cache.cc,v 1.58 2002/03/26 07:38:58 jgg Exp $
 /* ######################################################################
    
    apt-cache - Manages the cache files
@@ -32,7 +32,7 @@
 #include <apti18n.h>
 
 #include <locale.h>
-#include <iostream.h>
+#include <iostream>
 #include <unistd.h>
 #include <errno.h>
 #include <regex.h>
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 98461051e..a6355af31 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: apt-get.cc,v 1.115 2002/03/20 05:51:52 jgg Exp $
+// $Id: apt-get.cc,v 1.116 2002/03/26 07:38:58 jgg Exp $
 /* ######################################################################
    
    apt-get - Cover for dpkg
@@ -46,7 +46,7 @@
 #include "acqprogress.h"
 
 #include <locale.h>
-#include <fstream.h>
+#include <fstream>
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
diff --git a/cmdline/indexcopy.cc b/cmdline/indexcopy.cc
index 48edb143a..3ce12a94b 100644
--- a/cmdline/indexcopy.cc
+++ b/cmdline/indexcopy.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: indexcopy.cc,v 1.9 2001/08/18 22:20:40 jgg Exp $
+// $Id: indexcopy.cc,v 1.10 2002/03/26 07:38:58 jgg Exp $
 /* ######################################################################
 
    Index Copying - Aid for copying and verifying the index files
@@ -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 --git a/debian/changelog b/debian/changelog
index fd8f13bcc..58d2af3d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,14 +12,15 @@ apt (0.5.5) unstable; urgency=low
   * /usr/doc reference in postinst. Closes: #126189
   * Doc updates. Closes: #120689
   * Possible apt-cache segfault. Closes: #120311, #118431, #117915, #135295,
-          #131062
+          #131062, #136749
   * Print special message for EAI_AGAIN. Closes: #131397
   * libapt-pkg-dev needs to bring in the apt-inst library if linking
     is to work. Closes: #133943
   * Typos, Doc Stuff. Closes: #132772, #129970, #123642, #114892, #113786,
-         #109591, #105920, #103678
+         #109591, #105920, #103678, #139752, #138186, #138054	 
   * Fix possibility for tag file parsing to fail in some unlikely situations.
-    Closes: #139328    
+    Closes: #139328
+  * Use std C++ names for some header files. Closes: #128741
   
  -- Randolph Chung <tausq@debian.org>  Tue,  4 Dec 2001 23:26:42 -0800
 
diff --git a/test/versiontest.cc b/test/versiontest.cc
index 20da49b72..3f90adf05 100644
--- a/test/versiontest.cc
+++ b/test/versiontest.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: versiontest.cc,v 1.2 2001/02/20 07:03:18 jgg Exp $
+// $Id: versiontest.cc,v 1.3 2002/03/26 07:38:58 jgg Exp $
 /* ######################################################################
 
    Version Test - Simple program to run through a file and comare versions.
@@ -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) 
 {