Fixed g++4 build problems (lots of extra qualifications).

4 files changed, 65 insertions, 1 deletions

diff --git a/emulators/gpsim/distinfo b/emulators/gpsim/distinfo
index 3c3854cbf57..0940b6a0ee8 100644
--- a/emulators/gpsim/distinfo
+++ b/emulators/gpsim/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.8 2006/06/19 22:05:14 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/10/14 08:14:11 rillig Exp $
 
 SHA1 (gpsim-0.21.11.tar.gz) = 05337560a6b48a9afb7a3f4be1ba606709f6b30a
 RMD160 (gpsim-0.21.11.tar.gz) = 36001180948fc2394043d8283dc1dd028ee4f922
 Size (gpsim-0.21.11.tar.gz) = 1218332 bytes
 SHA1 (patch-aa) = 0d102952cb8dbe7faaf50416a2d9bec24683c300
 SHA1 (patch-ab) = 199403ee700b145dcb44f42c258903903af20785
+SHA1 (patch-ac) = 1c2cf1059db73c385817199bb35672f4f2246a67
+SHA1 (patch-ad) = f172ec71e2c2ef6bb798da79e1f73c063ff27d5b
+SHA1 (patch-ae) = 5185e3cbea6d5e036020f1de9636907efe54c851
diff --git a/emulators/gpsim/patches/patch-ac b/emulators/gpsim/patches/patch-ac
new file mode 100644
index 00000000000..bbf44cbd4a0
--- /dev/null
+++ b/emulators/gpsim/patches/patch-ac
@@ -0,0 +1,35 @@
+$NetBSD: patch-ac,v 1.5 2007/10/14 08:14:11 rillig Exp $
+
+--- src/value.h.orig	2005-09-07 15:34:24.000000000 +0200
++++ src/value.h	2007-10-14 09:59:18.000000000 +0200
+@@ -290,7 +290,7 @@ public:
+ 
+   bool getVal() { return value; }
+ 
+-  static Boolean* Boolean::typeCheck(Value* val, string valDesc);
++  static Boolean* typeCheck(Value* val, string valDesc);
+   virtual bool compare(ComparisonOperator *compOp, Value *rvalue);
+ 
+   virtual Value *copy() { return new Boolean(value); }
+@@ -353,9 +353,9 @@ public:
+   virtual char *toString(char *, int len);
+   virtual char *toBitStr(char *, int len);
+ 
+-  static Integer* Integer::typeCheck(Value* val, string valDesc);
+-  static Integer* Integer::assertValid(Value* val, string valDesc, gint64 valMin);
+-  static Integer* Integer::assertValid(Value* val, string valDesc, gint64 valMin, gint64 valMax);
++  static Integer* typeCheck(Value* val, string valDesc);
++  static Integer* assertValid(Value* val, string valDesc, gint64 valMin);
++  static Integer* assertValid(Value* val, string valDesc, gint64 valMin, gint64 valMax);
+   virtual bool compare(ComparisonOperator *compOp, Value *rvalue);
+ 
+   inline operator gint64() {
+@@ -498,7 +498,7 @@ public:
+   /// copy the object value to a user char array
+   virtual char *toString(char *, int len);
+ 
+-  static AbstractRange* AbstractRange::typeCheck(Value* val, string valDesc);
++  static AbstractRange* typeCheck(Value* val, string valDesc);
+   virtual bool compare(ComparisonOperator *compOp, Value *rvalue);
+ 
+ private:
diff --git a/emulators/gpsim/patches/patch-ad b/emulators/gpsim/patches/patch-ad
new file mode 100644
index 00000000000..4e0add2fd16
--- /dev/null
+++ b/emulators/gpsim/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.5 2007/10/14 08:14:11 rillig Exp $
+
+--- cli/ui_gpsim.cc.orig	2005-09-24 05:59:20.000000000 +0200
++++ cli/ui_gpsim.cc	2007-10-14 10:02:20.000000000 +0200
+@@ -34,7 +34,7 @@ public:
+   CGpsimUserInterface(const char *paStrings[]);
+   virtual ~CGpsimUserInterface() {}
+ 
+-  void CGpsimUserInterface::SetStreams(FILE *in, FILE *out);
++  void SetStreams(FILE *in, FILE *out);
+   virtual ISimConsole &GetConsole();
+   virtual void DisplayMessage(unsigned int uStringID, ...);
+   virtual void DisplayMessage(FILE * pOut, unsigned int uStringID, ...);
diff --git a/emulators/gpsim/patches/patch-ae b/emulators/gpsim/patches/patch-ae
new file mode 100644
index 00000000000..0b9c1603926
--- /dev/null
+++ b/emulators/gpsim/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.5 2007/10/14 08:14:11 rillig Exp $
+
+--- src/p12x.h.orig	2005-09-26 05:51:23.000000000 +0200
++++ src/p12x.h	2007-10-14 10:05:47.000000000 +0200
+@@ -108,7 +108,7 @@ class P12CE518 : public P12C508
+ 
+   virtual PROCESSOR_TYPE isa(void){return _P12CE518_;};
+   virtual void tris_instruction(unsigned int tris_register);
+-  virtual void P12CE518::set_eeprom(I2C_EE *e);
++  virtual void set_eeprom(I2C_EE *e);
+ 
+   P12CE518(void);
+   static Processor *construct(void);