Fixed G++ compile problem

Author: jgg
Date: 1999-08-08 03:34:08 GMT
Fixed G++ compile problem

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index f601f17dbc4c3f4b9a4fe46ff4dc00628302daba..3b1b6da821c5bb5a760aeb0fa481e5af5c38d232 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: apt-cdrom.cc,v 1.28 1999/07/12 02:59:36 jgg Exp $
+// $Id: apt-cdrom.cc,v 1.29 1999/08/08 03:34:13 jgg Exp $
 /* ######################################################################
    
    APT CDROM - Tool for handling APT's CDROM database.
@@ -406,7 +406,7 @@ bool WriteSourceList(string Name,vector<string> &List,bool Source)
       // Grok it
       string cType;
       string URI;
-      char *C = Buffer;
+      const char *C = Buffer;
       if (ParseQuoteWord(C,cType) == false ||
          ParseQuoteWord(C,URI) == false)
       {

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 1be5d3bf93d85627bd86b8bb24d7fe0135eb72fe..c53c3ddebd37c0e7e33dbe1e4ddfe12be98fc031 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: cdrom.cc,v 1.13 1999/07/12 03:00:53 jgg Exp $
+// $Id: cdrom.cc,v 1.14 1999/08/08 03:34:08 jgg Exp $
 /* ######################################################################
 
    CDROM URI method for APT
@@ -20,8 +20,8 @@
 
 class CDROMMethod : public pkgAcqMethod
 {
-   Configuration Database;
    bool DatabaseLoaded;
+   ::Configuration Database;
    string CurrentID;
    
    virtual bool Fetch(FetchItem *Itm);