Bug#126770: linuxconf: Build failure with g++ 3.0 (hppa/unstable)
Package: linuxconf
Version: 1.26r4-1
Severity: important
Tags: patch
Filing important because hppa is in woody (and requires gcc 3.0)
The following patch allows linuxconf to build with g++ 3.0.
lamont
====================================================================
diff -ur t/linuxconf-1.26r4/libmodules/parsers/viewedit.cc linuxconf-1.26r4/libmodules/parsers/viewedit.cc
--- t/linuxconf-1.26r4/libmodules/parsers/viewedit.cc Sat Dec 30 10:21:24 2000
+++ linuxconf-1.26r4/libmodules/parsers/viewedit.cc Fri Dec 28 11:01:15 2001
@@ -5,7 +5,7 @@
};
class VIEWEDIT_FIELD: public ARRAY_OBJ{
- friend VIEWEDIT;
+ friend class VIEWEDIT;
const char *keyword;
VIEWITEM *it;
SSTRING val;
diff -ur t/linuxconf-1.26r4/modules/Xkbdconf/devicelist.cc linuxconf-1.26r4/modules/Xkbdconf/devicelist.cc
--- t/linuxconf-1.26r4/modules/Xkbdconf/devicelist.cc Tue Dec 12 12:19:34 2000
+++ linuxconf-1.26r4/modules/Xkbdconf/devicelist.cc Fri Dec 28 09:50:02 2001
@@ -4,6 +4,7 @@
#include <map>
#include <string>
#include "devicelist.h"
+using namespace std;
DEVICE::DEVICE()
{
diff -ur t/linuxconf-1.26r4/modules/Xkbdconf/devicelist.h linuxconf-1.26r4/modules/Xkbdconf/devicelist.h
--- t/linuxconf-1.26r4/modules/Xkbdconf/devicelist.h Tue Nov 28 13:52:28 2000
+++ linuxconf-1.26r4/modules/Xkbdconf/devicelist.h Fri Dec 28 09:49:47 2001
@@ -10,7 +10,7 @@
class DEVICE: public ARRAY_OBJ
{
private:
- map<string,string> options;
+ std::map<std::string,std::string> options;
public:
DEVICE();
~DEVICE();
diff -ur t/linuxconf-1.26r4/modules/apache/viewedit.cc linuxconf-1.26r4/modules/apache/viewedit.cc
--- t/linuxconf-1.26r4/modules/apache/viewedit.cc Tue Oct 9 22:47:38 2001
+++ linuxconf-1.26r4/modules/apache/viewedit.cc Fri Dec 28 01:58:20 2001
@@ -5,7 +5,7 @@
};
class VIEWEDIT_FIELD: public ARRAY_OBJ{
- friend VIEWEDIT;
+ friend class VIEWEDIT;
const char *keyword;
VIEWITEM *it;
SSTRING val;
diff -ur t/linuxconf-1.26r4/modules/kbdconf/devicelist.cc linuxconf-1.26r4/modules/kbdconf/devicelist.cc
--- t/linuxconf-1.26r4/modules/kbdconf/devicelist.cc Mon Dec 11 13:36:09 2000
+++ linuxconf-1.26r4/modules/kbdconf/devicelist.cc Fri Dec 28 09:19:14 2001
@@ -19,7 +19,7 @@
const char *DEVICE::get_option(const char *name)
{
- map<string,string>::iterator i = options.find(name);
+ std::map<std::string,std::string>::iterator i = options.find(name);
if (i != options.end())
return i->second.c_str();
return NULL;
diff -ur t/linuxconf-1.26r4/modules/kbdconf/devicelist.h linuxconf-1.26r4/modules/kbdconf/devicelist.h
--- t/linuxconf-1.26r4/modules/kbdconf/devicelist.h Mon Dec 4 17:52:51 2000
+++ linuxconf-1.26r4/modules/kbdconf/devicelist.h Fri Dec 28 09:18:31 2001
@@ -10,7 +10,7 @@
class DEVICE: public ARRAY_OBJ
{
private:
- map<string,string> options;
+ std::map<std::string,std::string> options;
public:
DEVICE();
~DEVICE();
diff -ur t/linuxconf-1.26r4/modules/modemconf/wv/wvlog.h linuxconf-1.26r4/modules/modemconf/wv/wvlog.h
--- t/linuxconf-1.26r4/modules/modemconf/wv/wvlog.h Tue May 9 07:59:38 2000
+++ linuxconf-1.26r4/modules/modemconf/wv/wvlog.h Fri Dec 28 08:55:15 2001
@@ -25,7 +25,7 @@
// or transmits log messages.
class WvLogRcvBase
{
- friend WvLog;
+ friend class WvLog;
protected:
const char *appname(const WvLog *log) const;
virtual void log(const WvLog *source, int loglevel,
@@ -43,7 +43,7 @@
// to all registered WvLogRcv's.
class WvLog : public WvStream
{
- friend WvLogRcvBase;
+ friend class WvLogRcvBase;
public:
enum LogLevel {
Critical = 0,
diff -ur t/linuxconf-1.26r4/modules/modemconf/wv/wvmodemscan.h linuxconf-1.26r4/modules/modemconf/wv/wvmodemscan.h
--- t/linuxconf-1.26r4/modules/modemconf/wv/wvmodemscan.h Tue Sep 19 13:53:06 2000
+++ linuxconf-1.26r4/modules/modemconf/wv/wvmodemscan.h Fri Dec 28 08:55:36 2001
@@ -61,7 +61,7 @@
{ return baud; }
WvString initstr() const;
- friend WvModemScanList;
+ friend class WvModemScanList;
};
diff -ur t/linuxconf-1.26r4/modules/module_apis/devconf_api.h linuxconf-1.26r4/modules/module_apis/devconf_api.h
--- t/linuxconf-1.26r4/modules/module_apis/devconf_api.h Thu Sep 7 21:41:31 2000
+++ linuxconf-1.26r4/modules/module_apis/devconf_api.h Fri Dec 28 08:42:11 2001
@@ -15,12 +15,12 @@
DEVCONF_API *tb[])
{
return module_get_apis (DEVCONF_API_KEY,DEVCONF_API_REV
- ,client,(void*[])tb);
+ ,client,(void**)tb);
}
inline void devconf_apis_end(DEVCONF_API *apis[], int nbapis)
{
- module_release_apis (DEVCONF_API_KEY,(void*[])apis,nbapis);
+ module_release_apis (DEVCONF_API_KEY,(void**)apis,nbapis);
}
inline bool devconf_api_available(const char *client)
diff -ur t/linuxconf-1.26r4/modules/module_apis/fwinfo_api.h linuxconf-1.26r4/modules/module_apis/fwinfo_api.h
--- t/linuxconf-1.26r4/modules/module_apis/fwinfo_api.h Tue Dec 19 20:16:03 2000
+++ linuxconf-1.26r4/modules/module_apis/fwinfo_api.h Fri Dec 28 08:39:47 2001
@@ -15,12 +15,12 @@
FWINFO_API *tb[])
{
return module_get_apis (FWINFO_API_KEY,FWINFO_API_REV
- ,client,(void*[])tb);
+ ,client,(void**)tb);
}
inline void fwinfo_apis_end(FWINFO_API *apis[], int nbapis)
{
- module_release_apis (FWINFO_API_KEY,(void*[])apis,nbapis);
+ module_release_apis (FWINFO_API_KEY,(void**)apis,nbapis);
}
inline bool fwinfo_api_available(const char *client)
diff -ur t/linuxconf-1.26r4/modules/module_apis/servicectl_api.h linuxconf-1.26r4/modules/module_apis/servicectl_api.h
--- t/linuxconf-1.26r4/modules/module_apis/servicectl_api.h Sun Sep 10 20:44:05 2000
+++ linuxconf-1.26r4/modules/module_apis/servicectl_api.h Fri Dec 28 01:45:03 2001
@@ -15,12 +15,12 @@
SERVICECTL_API *tb[])
{
return module_get_apis (SERVICECTL_API_KEY,SERVICECTL_API_REV
- ,client,(void*[])tb);
+ ,client,(void**)tb);
}
inline void servicectl_apis_end(SERVICECTL_API *apis[], int nbapis)
{
- module_release_apis (SERVICECTL_API_KEY,(void*[])apis,nbapis);
+ module_release_apis (SERVICECTL_API_KEY,(void**)apis,nbapis);
}
inline bool servicectl_api_available(const char *client)
diff -ur t/linuxconf-1.26r4/modules/mouseconf/devicelist.h linuxconf-1.26r4/modules/mouseconf/devicelist.h
--- t/linuxconf-1.26r4/modules/mouseconf/devicelist.h Tue Nov 28 21:15:43 2000
+++ linuxconf-1.26r4/modules/mouseconf/devicelist.h Fri Dec 28 10:25:08 2001
@@ -11,7 +11,7 @@
class DEVICE: public ARRAY_OBJ
{
private:
- map<string,string> options;
+ std::map<std::string,std::string> options;
public:
DEVICE();
~DEVICE();
diff -ur t/linuxconf-1.26r4/userconf/userconf.h linuxconf-1.26r4/userconf/userconf.h
--- t/linuxconf-1.26r4/userconf/userconf.h Fri Sep 14 14:33:55 2001
+++ linuxconf-1.26r4/userconf/userconf.h Fri Dec 28 00:39:04 2001
@@ -120,7 +120,7 @@
// Use to associate a help for the privilege section of the user account
// dialog.
class REGISTER_PRIVI_HELP{
- friend USERPRIVI_COMNG;
+ friend class USERPRIVI_COMNG;
REGISTER_PRIVI_HELP *next;
TRANS_NOTLOAD *title;
HELP_FILE &help;
@@ -395,7 +395,7 @@
class GROUP: public ARRAY_OBJ{
- friend GROUPS;
+ friend class GROUPS;
SSTRING name;
SSTRING passwd;
int gid;
====================================================================
-- System Information
Debian Release: 3.0
Kernel Version: Linux smallone 2.4.9-pa79 #2 Thu Nov 8 18:18:02 MST 2001 parisc64 unknown
Reply to: