From cf1e1132c6cd84ab68a065153247671e83bf298f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 15 May 2015 14:48:23 +0300 Subject: Fix compilation issue with old gcc. --- src/localconsts.h | 6 ++++++ src/resources/map/map.h | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/localconsts.h b/src/localconsts.h index 7cddefdcd..1566292f5 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -85,6 +85,12 @@ #include #endif +#ifdef ADVGCC +#define const2 const +#else // ADVGCC +#define const2 +#endif // ADVGCC + #ifdef __GNUC__ #ifdef ENABLE_CILKPLUS #if GCC_VERSION < 40900 diff --git a/src/resources/map/map.h b/src/resources/map/map.h index 89ef884c4..e8b3a8e97 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -411,10 +411,10 @@ class Map final : public Properties, public ConfigListener } const std::string file; - const int x; - const int y; - const int w; - const int h; + const2 int x; + const2 int y; + const2 int w; + const2 int h; }; std::vector mParticleEffects; -- cgit v1.2.3-60-g2f50