merged debian-sid branch and resolved conflicts

[apt.git] / ftparchive / apt-ftparchive.h

diff --git a/ftparchive/apt-ftparchive.h b/ftparchive/apt-ftparchive.h
index c228903ba196f8265e5e84897da7f16240940e15..240cf9ba73b87faea7d054efe0400e076ea30132 100644 (file)
--- a/ftparchive/apt-ftparchive.h
+++ b/ftparchive/apt-ftparchive.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: apt-ftparchive.h,v 1.2 2001/02/20 07:03:18 jgg Exp $
+// $Id: apt-ftparchive.h,v 1.3 2001/05/29 03:51:37 jgg Exp $
 /* ######################################################################
 
    Writer 
@@ -13,12 +13,12 @@
 #ifndef APT_FTPARCHIVE_H
 #define APT_FTPARCHIVE_H
 
-#ifdef __GNUG__
-#pragma interface "apt-ftparchive.h"
-#endif
 
 #include <fstream>
 
+using std::ostream;
+using std::ofstream;
+
 extern ostream c0out;
 extern ostream c1out;
 extern ostream c2out;