From 5b76e7f23d2d4da544541ef90ee253c50eb3cc64 Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:54:33 +0000
Subject: [PATCH] Fixed G++ compile problem Author: jgg Date: 1999-08-08
 03:34:08 GMT Fixed G++ compile problem

---
 cmdline/apt-cdrom.cc | 4 ++--
 methods/cdrom.cc     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index f601f17db..3b1b6da82 100644
--- 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 1be5d3bf9..c53c3ddeb 100644
--- 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);
-- 
2.45.2