From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Sat, 9 Jun 2007 00:08:36 +0000 (+0200)
Subject: * merged apt--no-pragma
X-Git-Tag: 0.7.24ubuntu1~184
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/8d4b705ab0ef3a0de13a9ff9f1aa47f09112f374

* merged apt--no-pragma
---

8d4b705ab0ef3a0de13a9ff9f1aa47f09112f374
diff --cc apt-pkg/contrib/sha256.h
index 70b3ae2ad,01b638d56..c490bfa4d
--- a/apt-pkg/contrib/sha256.h
+++ b/apt-pkg/contrib/sha256.h
@@@ -14,12 -14,9 +14,8 @@@
  #ifndef APTPKG_SHA256_H
  #define APTPKG_SHA256_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/sha256.h"
- #endif 
- 
  #include <string>
  #include <algorithm>
 -#include <stdint.h>
  
  using std::string;
  using std::min;
diff --cc apt-pkg/deb/debrecords.cc
index 5eb2d67bb,6ecbd15d6..5421b3db7
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@@ -8,13 -8,8 +8,10 @@@
     ##################################################################### */
  									/*}}}*/
  // Include Files							/*{{{*/
- #ifdef __GNUG__
- #pragma implementation "apt-pkg/debrecords.h"
- #endif
  #include <apt-pkg/debrecords.h>
 +#include <apt-pkg/strutl.h>
  #include <apt-pkg/error.h>
 +#include <langinfo.h>
  									/*}}}*/
  
  // RecordParser::debRecordParser - Constructor				/*{{{*/
diff --cc apt-pkg/deb/debrecords.h
index 24e5aab88,3f1956164..fdf8d762b
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@@ -14,12 -14,7 +14,8 @@@
  #ifndef PKGLIB_DEBRECORDS_H
  #define PKGLIB_DEBRECORDS_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/debrecords.h"
- #endif 
- 
  #include <apt-pkg/pkgrecords.h>
 +#include <apt-pkg/indexfile.h>
  #include <apt-pkg/tagfile.h>
  
  class debRecordParser : public pkgRecords::Parser
diff --cc apt-pkg/indexfile.cc
index fad38772b,63f692c1d..2dda2d892
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@@ -8,15 -8,8 +8,11 @@@
     ##################################################################### */
  									/*}}}*/
  // Include Files							/*{{{*/
- #ifdef __GNUG__
- #pragma implementation "apt-pkg/indexfile.h"
- #endif
- 
 +#include <apt-pkg/configuration.h>
  #include <apt-pkg/indexfile.h>
  #include <apt-pkg/error.h>
 +
 +#include <clocale>
  									/*}}}*/
  
  // Global list of Item supported
diff --cc apt-pkg/packagemanager.h
index 48f53576c,35cdca913..53600fb61
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@@ -23,14 -23,9 +23,11 @@@
  #ifndef PKGLIB_PACKAGEMANAGER_H
  #define PKGLIB_PACKAGEMANAGER_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/packagemanager.h"
- #endif
  
  #include <string>
 +#include <iostream>
  #include <apt-pkg/pkgcache.h>
 +#include <apt-pkg/depcache.h>
  
  using std::string;
  
diff --cc apt-pkg/pkgcache.cc
index 93ad56641,5672e60a4..7e3b9d78c
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@@ -20,13 -20,7 +20,8 @@@
     ##################################################################### */
  									/*}}}*/
  // Include Files							/*{{{*/
- #ifdef __GNUG__
- #pragma implementation "apt-pkg/pkgcache.h"
- #pragma implementation "apt-pkg/cacheiterators.h"
- #endif 
- 
  #include <apt-pkg/pkgcache.h>
 +#include <apt-pkg/indexfile.h>
  #include <apt-pkg/version.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/strutl.h>
diff --cc apt-pkg/pkgcachegen.h
index fae1a60a6,70616c0a8..a47b097b3
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@@ -19,12 -19,8 +19,9 @@@
  #ifndef PKGLIB_PKGCACHEGEN_H
  #define PKGLIB_PKGCACHEGEN_H
  
- #ifdef __GNUG__
- #pragma interface "apt-pkg/pkgcachegen.h"
- #endif 
  
  #include <apt-pkg/pkgcache.h>
 +#include <apt-pkg/md5.h>
  
  class pkgSourceList;
  class OpProgress;