diff options
Diffstat (limited to 'ftparchive')
| -rw-r--r-- | ftparchive/apt-ftparchive.cc | 9 | ||||
| -rw-r--r-- | ftparchive/apt-ftparchive.h | 3 | ||||
| -rw-r--r-- | ftparchive/cachedb.cc | 4 | ||||
| -rw-r--r-- | ftparchive/cachedb.h | 4 | ||||
| -rw-r--r-- | ftparchive/multicompress.cc | 4 | ||||
| -rw-r--r-- | ftparchive/multicompress.h | 4 | ||||
| -rw-r--r-- | ftparchive/override.cc | 4 | ||||
| -rw-r--r-- | ftparchive/override.h | 4 | ||||
| -rw-r--r-- | ftparchive/writer.cc | 5 | ||||
| -rw-r--r-- | ftparchive/writer.h | 3 |
10 files changed, 7 insertions, 37 deletions
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 0e2be8a00..3b1e80631 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -10,10 +10,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "apt-ftparchive.h" -#endif - #include "apt-ftparchive.h" #include <apt-pkg/error.h> @@ -24,6 +20,7 @@ #include <apti18n.h> #include <algorithm> +#include <climits> #include <sys/time.h> #include <regex.h> @@ -547,8 +544,8 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup) /* */ bool ShowHelp(CommandLine &CmdL) { - ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION, - COMMON_OS,COMMON_CPU,__DATE__,__TIME__); + ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION, + COMMON_ARCH,__DATE__,__TIME__); if (_config->FindB("version") == true) return true; diff --git a/ftparchive/apt-ftparchive.h b/ftparchive/apt-ftparchive.h index c364d670e..240cf9ba7 100644 --- a/ftparchive/apt-ftparchive.h +++ b/ftparchive/apt-ftparchive.h @@ -13,9 +13,6 @@ #ifndef APT_FTPARCHIVE_H #define APT_FTPARCHIVE_H -#ifdef __GNUG__ -#pragma interface "apt-ftparchive.h" -#endif #include <fstream> diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 8a4ca0236..8de3a0b9e 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -10,10 +10,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "cachedb.h" -#endif - #include "cachedb.h" #include <apti18n.h> diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index afa22213a..c10f41ecc 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -12,9 +12,7 @@ #ifndef CACHEDB_H #define CACHEDB_H -#ifdef __GNUG__ -#pragma interface "cachedb.h" -#endif + #include <db.h> #include <string> diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index a3512c787..935c98877 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -14,10 +14,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "multicompress.h" -#endif - #include "multicompress.h" #include <apti18n.h> diff --git a/ftparchive/multicompress.h b/ftparchive/multicompress.h index 444d8626f..a65077e73 100644 --- a/ftparchive/multicompress.h +++ b/ftparchive/multicompress.h @@ -16,9 +16,7 @@ #ifndef MULTICOMPRESS_H #define MULTICOMPRESS_H -#ifdef __GNUG__ -#pragma interface "multicompress.h" -#endif + #include <string> #include <apt-pkg/fileutl.h> diff --git a/ftparchive/override.cc b/ftparchive/override.cc index b8b94843f..6f40bc865 100644 --- a/ftparchive/override.cc +++ b/ftparchive/override.cc @@ -10,10 +10,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "override.h" -#endif - #include "override.h" #include <apti18n.h> diff --git a/ftparchive/override.h b/ftparchive/override.h index e64641776..f270556eb 100644 --- a/ftparchive/override.h +++ b/ftparchive/override.h @@ -12,9 +12,7 @@ #ifndef OVERRIDE_H #define OVERRIDE_H -#ifdef __GNUG__ -#pragma interface "override.h" -#endif + #include <map> #include <string> diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index ea242d6af..9d248ab86 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -11,10 +11,6 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#ifdef __GNUG__ -#pragma implementation "writer.h" -#endif - #include "writer.h" #include <apti18n.h> @@ -32,6 +28,7 @@ #include <ftw.h> #include <fnmatch.h> #include <iostream> +#include <memory> #include "cachedb.h" #include "apt-ftparchive.h" diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 1d47d57ec..a4e4356f9 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -13,9 +13,6 @@ #ifndef WRITER_H #define WRITER_H -#ifdef __GNUG__ -#pragma interface "writer.h" -#endif #include <string> #include <stdio.h> |