1 files changed, 36 insertions, 36 deletions

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index c572f828a..093f979d7 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: pkgcachegen.h,v 1.9 1998/07/26 04:49:32 jgg Exp $
+// $Id: pkgcachegen.h,v 1.10 1998/08/09 00:51:34 jgg Exp $
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
@@ -34,6 +34,7 @@ class pkgCacheGenerator
    public:
    
    class ListParser;
+   friend ListParser;
    
    protected:
    
@@ -51,41 +52,7 @@ class pkgCacheGenerator
    unsigned long WriteUniqString(const char *S,unsigned int Size);
    inline unsigned long WriteUniqString(string S) {return WriteUniqString(S);};
    
-   public:
-   
-   // This is the abstract package list parser class.
-   class ListParser
-   {
-      pkgCacheGenerator *Owner;
-      friend pkgCacheGenerator;
-      
-      protected:
-      
-      inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);};
-      inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);};
-      inline unsigned long WriteString(string S) {return Owner->Map.WriteString(S);};
-      inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);};
-      bool NewDepends(pkgCache::VerIterator Ver,string Package,
-			 string Version,unsigned int Op,
-			 unsigned int Type);
-      bool NewProvides(pkgCache::VerIterator Ver,string Package,string Version);
-      
-      public:
-      
-      // These all operate against the current section
-      virtual string Package() = 0;
-      virtual string Version() = 0;
-      virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;
-      virtual bool UsePackage(pkgCache::PkgIterator Pkg,
-			      pkgCache::VerIterator Ver) = 0;
-      virtual unsigned long Offset() = 0;
-      virtual unsigned long Size() = 0;
-      
-      virtual bool Step() = 0;
-      
-      virtual ~ListParser() {};
-   };
-   friend ListParser;
+   public:   
 
    bool SelectFile(string File,unsigned long Flags = 0);
    bool MergeList(ListParser &List);
@@ -99,4 +66,37 @@ bool pkgSrcCacheCheck(pkgSourceList &List);
 bool pkgPkgCacheCheck(string CacheFile);
 bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress);
 
+// This is the abstract package list parser class.
+class pkgCacheGenerator::ListParser
+{
+   pkgCacheGenerator *Owner;
+   friend pkgCacheGenerator;
+   
+   protected:
+   
+   inline unsigned long WriteUniqString(string S) {return Owner->WriteUniqString(S);};
+   inline unsigned long WriteUniqString(const char *S,unsigned int Size) {return Owner->WriteUniqString(S,Size);};
+   inline unsigned long WriteString(string S) {return Owner->Map.WriteString(S);};
+   inline unsigned long WriteString(const char *S,unsigned int Size) {return Owner->Map.WriteString(S,Size);};
+   bool NewDepends(pkgCache::VerIterator Ver,string Package,
+		   string Version,unsigned int Op,
+		   unsigned int Type);
+   bool NewProvides(pkgCache::VerIterator Ver,string Package,string Version);
+   
+   public:
+   
+   // These all operate against the current section
+   virtual string Package() = 0;
+   virtual string Version() = 0;
+   virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;
+   virtual bool UsePackage(pkgCache::PkgIterator Pkg,
+			   pkgCache::VerIterator Ver) = 0;
+   virtual unsigned long Offset() = 0;
+   virtual unsigned long Size() = 0;
+   
+   virtual bool Step() = 0;
+   
+   virtual ~ListParser() {};
+};
+
 #endif