rpms/gpsim/devel gpsim-0.21.11.happy_gcc, NONE, 1.1 gpsim.spec, 1.5, 1.6

[Alain Portal (dionysos)]

Author: dionysos

Update of /cvs/extras/rpms/gpsim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26571

Modified Files:
	gpsim.spec 
Added Files:
	gpsim-0.21.11.happy_gcc 
Log Message:
Add patch to fix a compile time error with gcc-4.1.0.



--- NEW FILE gpsim-0.21.11.happy_gcc ---
--- gpsim-0.21.11/src/value.h	2005-09-07 15:34:24.000000000 +0200
+++ gpsim-0.21.11.fix/src/value.h	2006-03-14 15:31:44.000000000 +0100
@@ -290,7 +290,7 @@
 
   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 @@
   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 @@
   /// 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:


Index: gpsim.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gpsim.spec	13 Mar 2006 10:00:51 -0000	1.5
+++ gpsim.spec	14 Mar 2006 14:59:13 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.21.11
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontrôleurs PIC (TM) Microchip (TM)
 
@@ -8,6 +8,7 @@
 License:	GPL
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
+Patch:		%{name}-%{version}.happy_gcc
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch -p1
 %{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm
 
 %build
@@ -78,6 +80,9 @@
 %{_includedir}/*
 
 %changelog
+* Tue Mar 14 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.21.11-4
+  - Patch to make gcc-4.1.0 happy
+
 * Mon Mar 13 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.21.11-3
   - Rebuild for FE5