Bug#89066: libapt-pkg-dev; Doesn't compile with -pedantic

[Daniel Schepler <schepler@math.berkeley.edu>]

Package: libapt-pkg-dev
Version: 0.5.3
Severity: normal
Tags: patch

When I try to compile a program using libapt-pkg using the -pedantic
flag, it produces the following errors:

g++ -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/include/kde -I/usr/include/qt -I/usr/X11R6/include     -g -ansi -D_XOPEN_SOURCE -D_BSD_SOURCE -Wbad-function-cast -Wcast-align -Wundef -Wconversion -fno-exceptions -fno-check-new -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long -Wnon-virtual-dtor -fno-builtin  -c pkgview.cc
In file included from aptpkg.hh:8,
                 from pkgview.cc:2:
/usr/include/apt-pkg/configuration.h: In method `int Configuration::FindI(basic_string<char,string_char_traits<char>,__default_alloc_template<true,0> >, bool = 0) const':
/usr/include/apt-pkg/configuration.h:73: call of overloaded `FindI(const char *, bool &)' is ambiguous
/usr/include/apt-pkg/configuration.h:72: candidates are: int Configuration::FindI(const char *, int = 0) const
/usr/include/apt-pkg/configuration.h:73:                 int Configuration::FindI(basic_string<char,string_char_traits<char>,__default_alloc_template<true,0> >, bool = 0) const
/usr/include/apt-pkg/configuration.h:73: warning: control reaches end of non-void function `Configuration::FindI(basic_string<char,string_char_traits<char>,__default_alloc_template<true,0> >, bool) const'
In file included from aptpkg.hh:9,
                 from pkgview.cc:2:
/usr/include/apt-pkg/pkgsystem.h: In method `bool pkgSystem::Initialize(Configuration &)':
/usr/include/apt-pkg/pkgsystem.h:75: warning: unused parameter `class Configuration & Cnf'
/usr/include/apt-pkg/pkgsystem.h: In method `int pkgSystem::Score(const Configuration &)':
/usr/include/apt-pkg/pkgsystem.h:86: warning: unused parameter `const class Configuration & Cnf'

Here are patches which fix the compilation errors, and incidentally
the warnings too.

--- /usr/include/apt-pkg/configuration.h.orig   Mon Feb 19 23:03:17 2001
+++ /usr/include/apt-pkg/configuration.h        Fri Mar  9 12:22:03 2001
@@ -70,7 +70,7 @@
    string FindFile(const char *Name,const char *Default = 0) const;
    string FindDir(const char *Name,const char *Default = 0) const;
    int FindI(const char *Name,int Default = 0) const;
-   int FindI(string Name,bool Default = 0) const {return FindI(Name.c_str(),Default);};
+   int FindI(string Name,int Default = 0) const {return FindI(Name.c_str(),Default);};
    bool FindB(const char *Name,bool Default = false) const;
    bool FindB(string Name,bool Default = false) const {return FindB(Name.c_str(),Default);};
    string FindAny(const char *Name,const char *Default = 0) const;
--- /usr/include/apt-pkg/pkgsystem.h.orig   Mon Feb 19 23:03:17 2001
+++ /usr/include/apt-pkg/pkgsystem.h    Fri Mar  9 12:22:41 2001
@@ -72,7 +72,7 @@
 
    /* Load environment specific configuration and perform any other setup
       necessary */
-   virtual bool Initialize(Configuration &Cnf) {return true;};
+   virtual bool Initialize(Configuration & /* Cnf */) {return true;};
    
    /* Type is some kind of Globally Unique way of differentiating
       archive file types.. */
@@ -83,7 +83,7 @@
    
    /* Evauluate how 'right' we are for this system based on the filesystem
       etc.. */
-   virtual signed Score(Configuration const &Cnf) {return 0;};
+   virtual signed Score(Configuration const & /* Cnf */) {return 0;};
    
    pkgSystem();
    virtual ~pkgSystem() {};


-- System Information
Debian Release: testing/unstable
Kernel Version: Linux frobnitz 2.4.2 #1 Thu Feb 22 00:43:58 PST 2001 i686 unknown

Versions of the packages libapt-pkg-dev depends on:
ii  apt            0.5.3          Advanced front-end for dpkg
	^^^ (Provides virtual package libapt-pkg-libc6.2-3-2-3.1)