ALT Linux repos
Group :: Monitoring
RPM: gpsim
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: gpsim-gcc4.patch
Download
Download
--- src/value.h.orig 2005-09-07 17:34:24 +0400
+++ src/value.h 2006-07-22 11:05:49 +0400
@@ -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:
--- cli/ui_gpsim.cc.orig 2005-09-24 07:59:20 +0400
+++ cli/ui_gpsim.cc 2006-07-22 11:09:09 +0400
@@ -34,7 +34,7 @@
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, ...);
--- src/p12x.h.orig 2005-09-26 07:51:23 +0400
+++ src/p12x.h 2006-07-22 11:15:27 +0400
@@ -108,7 +108,7 @@
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);