From 92ea1804cab4e3b3adfdeeb1f99626eeda180f96 Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Tue, 14 Aug 2007 05:38:27 +0000 Subject: GCC doesn't like the extra qualifier when DECLARE_COMMAND_PARSER() etc. are used within the class definition. Added macros for the unqualified form. Feel free to give them a less cumbersome name -- I just wanted to be able to compile ScummVM again. :-) svn-id: r28608 --- engines/parallaction/parallaction.h | 114 +++++++++++++++++++----------------- 1 file changed, 59 insertions(+), 55 deletions(-) (limited to 'engines/parallaction') diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index 3da097cfbd..a190feff04 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -297,15 +297,19 @@ struct BackgroundInfo { #define DECLARE_COMMAND_PARSER(sig) void Parallaction::cmdParse_##sig() +#define DECLARE_UNQUALIFIED_COMMAND_PARSER(sig) void cmdParse_##sig() #define COMMAND_PARSER(sig) &Parallaction::cmdParse_##sig #define DECLARE_COMMAND_OPCODE(op) void Parallaction::cmdOp_##op() +#define DECLARE_UNQUALIFIED_COMMAND_OPCODE(op) void cmdOp_##op() #define COMMAND_OPCODE(op) &Parallaction::cmdOp_##op #define DECLARE_INSTRUCTION_PARSER(sig) void Parallaction::instParse_##sig() +#define DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(sig) void instParse_##sig() #define INSTRUCTION_PARSER(sig) &Parallaction::instParse_##sig #define DECLARE_INSTRUCTION_OPCODE(op) void Parallaction::instOp_##op() +#define DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(op) void instOp_##op() #define INSTRUCTION_OPCODE(op) &Parallaction::instOp_##op @@ -336,15 +340,15 @@ public: int nextToken; } _cmdParseCtxt; - DECLARE_COMMAND_PARSER(Invalid); - DECLARE_COMMAND_PARSER(Flags); - DECLARE_COMMAND_PARSER(Animation); - DECLARE_COMMAND_PARSER(Zone); - DECLARE_COMMAND_PARSER(Location); - DECLARE_COMMAND_PARSER(Drop); - DECLARE_COMMAND_PARSER(Call); - DECLARE_COMMAND_PARSER(Null); - DECLARE_COMMAND_PARSER(Move); + DECLARE_UNQUALIFIED_COMMAND_PARSER(Invalid); + DECLARE_UNQUALIFIED_COMMAND_PARSER(Flags); + DECLARE_UNQUALIFIED_COMMAND_PARSER(Animation); + DECLARE_UNQUALIFIED_COMMAND_PARSER(Zone); + DECLARE_UNQUALIFIED_COMMAND_PARSER(Location); + DECLARE_UNQUALIFIED_COMMAND_PARSER(Drop); + DECLARE_UNQUALIFIED_COMMAND_PARSER(Call); + DECLARE_UNQUALIFIED_COMMAND_PARSER(Null); + DECLARE_UNQUALIFIED_COMMAND_PARSER(Move); const Opcode *_commandOpcodes; @@ -353,23 +357,23 @@ public: Zone *z; } _cmdRunCtxt; - DECLARE_COMMAND_OPCODE(invalid); - DECLARE_COMMAND_OPCODE(set); - DECLARE_COMMAND_OPCODE(clear); - DECLARE_COMMAND_OPCODE(start); - DECLARE_COMMAND_OPCODE(speak); - DECLARE_COMMAND_OPCODE(get); - DECLARE_COMMAND_OPCODE(location); - DECLARE_COMMAND_OPCODE(open); - DECLARE_COMMAND_OPCODE(close); - DECLARE_COMMAND_OPCODE(on); - DECLARE_COMMAND_OPCODE(off); - DECLARE_COMMAND_OPCODE(call); - DECLARE_COMMAND_OPCODE(toggle); - DECLARE_COMMAND_OPCODE(drop); - DECLARE_COMMAND_OPCODE(quit); - DECLARE_COMMAND_OPCODE(move); - DECLARE_COMMAND_OPCODE(stop); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(invalid); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(set); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(clear); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(start); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(speak); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(get); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(location); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(open); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(close); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(on); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(off); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(call); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(toggle); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(drop); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(quit); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(move); + DECLARE_UNQUALIFIED_COMMAND_OPCODE(stop); const Opcode *_instructionParsers; @@ -379,20 +383,20 @@ public: LocalVariable *locals; } _instParseCtxt; - DECLARE_INSTRUCTION_PARSER(defLocal); - DECLARE_INSTRUCTION_PARSER(animation); - DECLARE_INSTRUCTION_PARSER(loop); - DECLARE_INSTRUCTION_PARSER(x); - DECLARE_INSTRUCTION_PARSER(y); - DECLARE_INSTRUCTION_PARSER(z); - DECLARE_INSTRUCTION_PARSER(f); - DECLARE_INSTRUCTION_PARSER(inc); - DECLARE_INSTRUCTION_PARSER(set); - DECLARE_INSTRUCTION_PARSER(move); - DECLARE_INSTRUCTION_PARSER(put); - DECLARE_INSTRUCTION_PARSER(call); - DECLARE_INSTRUCTION_PARSER(sound); - DECLARE_INSTRUCTION_PARSER(null); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(defLocal); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(animation); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(loop); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(x); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(y); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(z); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(f); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(inc); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(set); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(move); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(put); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(call); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(sound); + DECLARE_UNQUALIFIED_INSTRUCTION_PARSER(null); const Opcode *_instructionOpcodes; @@ -403,21 +407,21 @@ public: bool suspend; } _instRunCtxt; - DECLARE_INSTRUCTION_OPCODE(invalid); - DECLARE_INSTRUCTION_OPCODE(on); - DECLARE_INSTRUCTION_OPCODE(off); - DECLARE_INSTRUCTION_OPCODE(loop); - DECLARE_INSTRUCTION_OPCODE(endloop); - DECLARE_INSTRUCTION_OPCODE(null); - DECLARE_INSTRUCTION_OPCODE(inc); - DECLARE_INSTRUCTION_OPCODE(set); - DECLARE_INSTRUCTION_OPCODE(put); - DECLARE_INSTRUCTION_OPCODE(call); - DECLARE_INSTRUCTION_OPCODE(wait); - DECLARE_INSTRUCTION_OPCODE(start); - DECLARE_INSTRUCTION_OPCODE(sound); - DECLARE_INSTRUCTION_OPCODE(move); - DECLARE_INSTRUCTION_OPCODE(end); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(invalid); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(on); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(off); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(loop); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(endloop); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(null); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(inc); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(set); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(put); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(call); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(wait); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(start); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(sound); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(move); + DECLARE_UNQUALIFIED_INSTRUCTION_OPCODE(end); void parseLocation(const char *filename); virtual bool parseLocationLine(const char *filename, Script *script) = 0; -- cgit v1.2.3