diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-05-15 14:48:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-05-15 14:48:23 +0300 |
| commit | cf1e1132c6cd84ab68a065153247671e83bf298f (patch) | |
| tree | f35d5731ce05df57b375f2648f211bbd9bd6dfdc | |
| parent | 06a19f3327736f67907f012bd21bb1c0a21bb468 (diff) | |
| download | manaverse-cf1e1132c6cd84ab68a065153247671e83bf298f.tar.gz manaverse-cf1e1132c6cd84ab68a065153247671e83bf298f.tar.bz2 manaverse-cf1e1132c6cd84ab68a065153247671e83bf298f.tar.xz manaverse-cf1e1132c6cd84ab68a065153247671e83bf298f.zip | |
Fix compilation issue with old gcc.
| -rw-r--r-- | src/localconsts.h | 6 | ||||
| -rw-r--r-- | 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 <cilk/cilk.h> #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<ParticleEffectData> mParticleEffects; |