removed the UNUSED definition,
it breaks on my gcc and there's a portable way to avoid the unused parameter warning
This commit is contained in:
parent
4439a0c763
commit
7003277d4c
3 changed files with 3 additions and 11 deletions
|
@ -174,7 +174,7 @@ public:
|
|||
|
||||
// Will be overridden in the display subclass
|
||||
virtual void invalidate(const gamemap::location& loc) {invalidated_.insert(loc);};
|
||||
virtual void draw_minimap_units(int x UNUSED, int y UNUSED, int w UNUSED, int h UNUSED) {};
|
||||
virtual void draw_minimap_units(int /* x */, int /* y */, int /* w */, int /* h */) {};
|
||||
//this surface must be freed by the caller
|
||||
surface get_minimap(int w, int h);
|
||||
|
||||
|
|
|
@ -56,12 +56,4 @@ namespace std {
|
|||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* Macro for declaring function arguments unused. */
|
||||
#if defined(__GNUC__)
|
||||
# define UNUSED __attribute__((unused)) /* Flag variable as unused */
|
||||
#else /* not __GNUC__ */
|
||||
# define UNUSED
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
@ -246,8 +246,8 @@ public:
|
|||
class omniscient : public viewpoint
|
||||
{
|
||||
public:
|
||||
virtual bool shrouded(int x UNUSED, int y UNUSED) const {return false;};
|
||||
virtual bool fogged(int x UNUSED, int y UNUSED) const {return false;};
|
||||
virtual bool shrouded(int /* x */, int /* y */) const {return false;};
|
||||
virtual bool fogged(int /* x */, int /* y */) const {return false;};
|
||||
virtual ~omniscient() {};
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue