summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-13 22:45:06 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-13 22:45:06 +0300
commit6849c5919c02b4cf97de91c801b542e36eb089ce (patch)
treee5e693931887a06f2e4a75099753f3012cd8be57
parent8a7279daea883f86c2a500c368d252394faeea5b (diff)
downloadmv-6849c5919c02b4cf97de91c801b542e36eb089ce.tar.gz
mv-6849c5919c02b4cf97de91c801b542e36eb089ce.tar.bz2
mv-6849c5919c02b4cf97de91c801b542e36eb089ce.tar.xz
mv-6849c5919c02b4cf97de91c801b542e36eb089ce.zip
Add pragmas for prevent warnings about unused constants in simple types.
-rw-r--r--src/enums/simpletypes/advanced.h5
-rw-r--r--src/enums/simpletypes/allowsort.h5
-rw-r--r--src/enums/simpletypes/allplayers.h5
-rw-r--r--src/enums/simpletypes/append.h5
-rw-r--r--src/enums/simpletypes/autorelease.h5
-rw-r--r--src/enums/simpletypes/autotarget.h5
-rw-r--r--src/enums/simpletypes/beingid.h5
-rw-r--r--src/enums/simpletypes/beingtypeid.h5
-rw-r--r--src/enums/simpletypes/booldefines.h5
-rw-r--r--src/enums/simpletypes/damaged.h5
-rw-r--r--src/enums/simpletypes/donotalign.h5
-rw-r--r--src/enums/simpletypes/enable.h5
-rw-r--r--src/enums/simpletypes/equipm.h5
-rw-r--r--src/enums/simpletypes/equipped.h5
-rw-r--r--src/enums/simpletypes/favorite.h5
-rw-r--r--src/enums/simpletypes/forcedisplay.h5
-rw-r--r--src/enums/simpletypes/forcequantity.h5
-rw-r--r--src/enums/simpletypes/identified.h5
-rw-r--r--src/enums/simpletypes/ignorerecord.h5
-rw-r--r--src/enums/simpletypes/issell.h5
-rw-r--r--src/enums/simpletypes/itemcolor.h5
-rw-r--r--src/enums/simpletypes/keep.h5
-rw-r--r--src/enums/simpletypes/mainconfig.h5
-rw-r--r--src/enums/simpletypes/modal.h5
-rw-r--r--src/enums/simpletypes/modifiable.h5
-rw-r--r--src/enums/simpletypes/move.h5
-rw-r--r--src/enums/simpletypes/notify.h5
-rw-r--r--src/enums/simpletypes/npcnames.h5
-rw-r--r--src/enums/simpletypes/online.h5
-rw-r--r--src/enums/simpletypes/onthefly.h5
-rw-r--r--src/enums/simpletypes/protected.h5
-rw-r--r--src/enums/simpletypes/separator.h5
-rw-r--r--src/enums/simpletypes/sfx.h5
-rw-r--r--src/enums/simpletypes/showcenter.h5
-rw-r--r--src/enums/simpletypes/showemptyrows.h5
-rw-r--r--src/enums/simpletypes/skiperror.h5
-rw-r--r--src/enums/simpletypes/speech.h5
-rw-r--r--src/enums/simpletypes/trading.h5
-rw-r--r--src/enums/simpletypes/tryremovecolors.h5
-rw-r--r--src/enums/simpletypes/useargs.h5
-rw-r--r--src/enums/simpletypes/usebase64.h5
-rw-r--r--src/enums/simpletypes/useresman.h5
-rw-r--r--src/enums/simpletypes/visible.h5
-rw-r--r--src/localconsts.h6
44 files changed, 218 insertions, 3 deletions
diff --git a/src/enums/simpletypes/advanced.h b/src/enums/simpletypes/advanced.h
index 4aad05406..67601f572 100644
--- a/src/enums/simpletypes/advanced.h
+++ b/src/enums/simpletypes/advanced.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Advanced);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_ADVANCED_H
diff --git a/src/enums/simpletypes/allowsort.h b/src/enums/simpletypes/allowsort.h
index 2b68bbb65..f3c1ca8a4 100644
--- a/src/enums/simpletypes/allowsort.h
+++ b/src/enums/simpletypes/allowsort.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(AllowSort);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_ALLOWSORT_H
diff --git a/src/enums/simpletypes/allplayers.h b/src/enums/simpletypes/allplayers.h
index 575fff63c..5fb3e683c 100644
--- a/src/enums/simpletypes/allplayers.h
+++ b/src/enums/simpletypes/allplayers.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(AllPlayers);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_ALLPLAYERS_H
diff --git a/src/enums/simpletypes/append.h b/src/enums/simpletypes/append.h
index 0e83218e3..959650d12 100644
--- a/src/enums/simpletypes/append.h
+++ b/src/enums/simpletypes/append.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Append);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_APPEND_H
diff --git a/src/enums/simpletypes/autorelease.h b/src/enums/simpletypes/autorelease.h
index bb7249a91..dcf1a534a 100644
--- a/src/enums/simpletypes/autorelease.h
+++ b/src/enums/simpletypes/autorelease.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(AutoRelease);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_AUTORELEASE_H
diff --git a/src/enums/simpletypes/autotarget.h b/src/enums/simpletypes/autotarget.h
index 20b5ea5d6..8007edba5 100644
--- a/src/enums/simpletypes/autotarget.h
+++ b/src/enums/simpletypes/autotarget.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(AutoTarget);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_AUTOTARGET_H
diff --git a/src/enums/simpletypes/beingid.h b/src/enums/simpletypes/beingid.h
index ffc9eb6f6..b35f9900e 100644
--- a/src/enums/simpletypes/beingid.h
+++ b/src/enums/simpletypes/beingid.h
@@ -23,7 +23,12 @@
#include "enums/simpletypes/intdefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defIntEnum(BeingId, int);
defIntEnumNeg(BeingId);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_BEINGID_H
diff --git a/src/enums/simpletypes/beingtypeid.h b/src/enums/simpletypes/beingtypeid.h
index a36e7058b..9abe0cb54 100644
--- a/src/enums/simpletypes/beingtypeid.h
+++ b/src/enums/simpletypes/beingtypeid.h
@@ -23,7 +23,12 @@
#include "enums/simpletypes/intdefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defIntEnum(BeingTypeId, int);
defIntEnumNeg(BeingTypeId);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_BEINGTYPEID_H
diff --git a/src/enums/simpletypes/booldefines.h b/src/enums/simpletypes/booldefines.h
index 199389208..4a44cf53b 100644
--- a/src/enums/simpletypes/booldefines.h
+++ b/src/enums/simpletypes/booldefines.h
@@ -23,6 +23,8 @@
#include "localconsts.h"
+
+
#ifdef ADVGCC
#define defBoolEnum(name) \
@@ -32,7 +34,8 @@
MTrue = true \
}; \
const name name##_true = name::MTrue; \
- const name name##_false = name::MFalse
+ const name name##_false = name::MFalse \
+
#define fromBool(val, name) \
(val) ? name::MTrue : name::MFalse
diff --git a/src/enums/simpletypes/damaged.h b/src/enums/simpletypes/damaged.h
index 3b2e15fbc..0d37fa625 100644
--- a/src/enums/simpletypes/damaged.h
+++ b/src/enums/simpletypes/damaged.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Damaged);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_DAMAGED_H
diff --git a/src/enums/simpletypes/donotalign.h b/src/enums/simpletypes/donotalign.h
index 95948a571..57dca68aa 100644
--- a/src/enums/simpletypes/donotalign.h
+++ b/src/enums/simpletypes/donotalign.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(DoNotAlign);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_DONOTALIGN_H
diff --git a/src/enums/simpletypes/enable.h b/src/enums/simpletypes/enable.h
index cdf06317e..c339241f0 100644
--- a/src/enums/simpletypes/enable.h
+++ b/src/enums/simpletypes/enable.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Enable);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_ENABLE_H
diff --git a/src/enums/simpletypes/equipm.h b/src/enums/simpletypes/equipm.h
index a1f865457..3e107e9ef 100644
--- a/src/enums/simpletypes/equipm.h
+++ b/src/enums/simpletypes/equipm.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Equipm);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_EQUIPM_H
diff --git a/src/enums/simpletypes/equipped.h b/src/enums/simpletypes/equipped.h
index eac272c45..11c3abeef 100644
--- a/src/enums/simpletypes/equipped.h
+++ b/src/enums/simpletypes/equipped.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Equipped);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_EQUIPPED_H
diff --git a/src/enums/simpletypes/favorite.h b/src/enums/simpletypes/favorite.h
index cb5e15f38..52c631904 100644
--- a/src/enums/simpletypes/favorite.h
+++ b/src/enums/simpletypes/favorite.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Favorite);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_FAVORITE_H
diff --git a/src/enums/simpletypes/forcedisplay.h b/src/enums/simpletypes/forcedisplay.h
index c319704db..c9343d209 100644
--- a/src/enums/simpletypes/forcedisplay.h
+++ b/src/enums/simpletypes/forcedisplay.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(ForceDisplay);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_FORCEDISPLAY_H
diff --git a/src/enums/simpletypes/forcequantity.h b/src/enums/simpletypes/forcequantity.h
index 3425b33b4..58fc18dbe 100644
--- a/src/enums/simpletypes/forcequantity.h
+++ b/src/enums/simpletypes/forcequantity.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(ForceQuantity);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_FORCEQUANTITY_H
diff --git a/src/enums/simpletypes/identified.h b/src/enums/simpletypes/identified.h
index 5e15665f6..fb2f860ce 100644
--- a/src/enums/simpletypes/identified.h
+++ b/src/enums/simpletypes/identified.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Identified);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_IDENTIFIED_H
diff --git a/src/enums/simpletypes/ignorerecord.h b/src/enums/simpletypes/ignorerecord.h
index 0c762dc9d..3faa0bba7 100644
--- a/src/enums/simpletypes/ignorerecord.h
+++ b/src/enums/simpletypes/ignorerecord.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(IgnoreRecord);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_IGNORERECORD_H
diff --git a/src/enums/simpletypes/issell.h b/src/enums/simpletypes/issell.h
index 94f192396..6773982cf 100644
--- a/src/enums/simpletypes/issell.h
+++ b/src/enums/simpletypes/issell.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(IsSell);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_ISSELL_H
diff --git a/src/enums/simpletypes/itemcolor.h b/src/enums/simpletypes/itemcolor.h
index 258144b30..0106d36fc 100644
--- a/src/enums/simpletypes/itemcolor.h
+++ b/src/enums/simpletypes/itemcolor.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/intdefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defIntEnum(ItemColor, uint16_t);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_ITEMCOLOR_H
diff --git a/src/enums/simpletypes/keep.h b/src/enums/simpletypes/keep.h
index 8b1a9ceae..7bb56d338 100644
--- a/src/enums/simpletypes/keep.h
+++ b/src/enums/simpletypes/keep.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Keep);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_KEEP_H
diff --git a/src/enums/simpletypes/mainconfig.h b/src/enums/simpletypes/mainconfig.h
index e33b9399e..a767f337f 100644
--- a/src/enums/simpletypes/mainconfig.h
+++ b/src/enums/simpletypes/mainconfig.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(MainConfig);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_MAINCONFIG_H
diff --git a/src/enums/simpletypes/modal.h b/src/enums/simpletypes/modal.h
index 7c9da01d2..b351f2934 100644
--- a/src/enums/simpletypes/modal.h
+++ b/src/enums/simpletypes/modal.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Modal);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_MODAL_H
diff --git a/src/enums/simpletypes/modifiable.h b/src/enums/simpletypes/modifiable.h
index 37455b2f2..030f16ecc 100644
--- a/src/enums/simpletypes/modifiable.h
+++ b/src/enums/simpletypes/modifiable.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Modifiable);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_MODIFIABLE_H
diff --git a/src/enums/simpletypes/move.h b/src/enums/simpletypes/move.h
index f13a976c2..37470237a 100644
--- a/src/enums/simpletypes/move.h
+++ b/src/enums/simpletypes/move.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Move);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_MOVE_H
diff --git a/src/enums/simpletypes/notify.h b/src/enums/simpletypes/notify.h
index e03158801..2d1d3061d 100644
--- a/src/enums/simpletypes/notify.h
+++ b/src/enums/simpletypes/notify.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Notify);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_NOTIFY_H
diff --git a/src/enums/simpletypes/npcnames.h b/src/enums/simpletypes/npcnames.h
index 08af24ce7..247474d15 100644
--- a/src/enums/simpletypes/npcnames.h
+++ b/src/enums/simpletypes/npcnames.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(NpcNames);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_NPCNAMES_H
diff --git a/src/enums/simpletypes/online.h b/src/enums/simpletypes/online.h
index 7b7af9bf3..6fe539a6c 100644
--- a/src/enums/simpletypes/online.h
+++ b/src/enums/simpletypes/online.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Online);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_ONLINE_H
diff --git a/src/enums/simpletypes/onthefly.h b/src/enums/simpletypes/onthefly.h
index 2d139a121..177db701b 100644
--- a/src/enums/simpletypes/onthefly.h
+++ b/src/enums/simpletypes/onthefly.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(OnTheFly);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_ONTHEFLY_H
diff --git a/src/enums/simpletypes/protected.h b/src/enums/simpletypes/protected.h
index 96b0b26c0..2c4fbd403 100644
--- a/src/enums/simpletypes/protected.h
+++ b/src/enums/simpletypes/protected.h
@@ -23,8 +23,11 @@
#include "enums/simpletypes/booldefines.h"
-#include "localconsts.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
defBoolEnum(Protected);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_PROTECTED_H
diff --git a/src/enums/simpletypes/separator.h b/src/enums/simpletypes/separator.h
index 2de51496b..78f958178 100644
--- a/src/enums/simpletypes/separator.h
+++ b/src/enums/simpletypes/separator.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Separator);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_SEPARATOR_H
diff --git a/src/enums/simpletypes/sfx.h b/src/enums/simpletypes/sfx.h
index a5924639d..8579d6565 100644
--- a/src/enums/simpletypes/sfx.h
+++ b/src/enums/simpletypes/sfx.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Sfx);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_SFX_H
diff --git a/src/enums/simpletypes/showcenter.h b/src/enums/simpletypes/showcenter.h
index ce1368cf4..9097dd13e 100644
--- a/src/enums/simpletypes/showcenter.h
+++ b/src/enums/simpletypes/showcenter.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(ShowCenter);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_SHOWCENTER_H
diff --git a/src/enums/simpletypes/showemptyrows.h b/src/enums/simpletypes/showemptyrows.h
index 4656682ef..c4d14025b 100644
--- a/src/enums/simpletypes/showemptyrows.h
+++ b/src/enums/simpletypes/showemptyrows.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(ShowEmptyRows);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_SHOWEMPTYROWS_H
diff --git a/src/enums/simpletypes/skiperror.h b/src/enums/simpletypes/skiperror.h
index b9ca2a8a4..74d024cd4 100644
--- a/src/enums/simpletypes/skiperror.h
+++ b/src/enums/simpletypes/skiperror.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(SkipError);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_SKIPERROR_H
diff --git a/src/enums/simpletypes/speech.h b/src/enums/simpletypes/speech.h
index 1cc35517d..438600f48 100644
--- a/src/enums/simpletypes/speech.h
+++ b/src/enums/simpletypes/speech.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Speech);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_SPEECH_H
diff --git a/src/enums/simpletypes/trading.h b/src/enums/simpletypes/trading.h
index 170b3b4fb..c7539d4e6 100644
--- a/src/enums/simpletypes/trading.h
+++ b/src/enums/simpletypes/trading.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Trading);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_TRADING_H
diff --git a/src/enums/simpletypes/tryremovecolors.h b/src/enums/simpletypes/tryremovecolors.h
index b1759d853..c98c5fffb 100644
--- a/src/enums/simpletypes/tryremovecolors.h
+++ b/src/enums/simpletypes/tryremovecolors.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(TryRemoveColors);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_TRYREMOVECOLORS_H
diff --git a/src/enums/simpletypes/useargs.h b/src/enums/simpletypes/useargs.h
index f3c2bf94e..59bebbfb3 100644
--- a/src/enums/simpletypes/useargs.h
+++ b/src/enums/simpletypes/useargs.h
@@ -23,8 +23,11 @@
#include "enums/simpletypes/booldefines.h"
-#include "localconsts.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
defBoolEnum(UseArgs);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_USEARGS_H
diff --git a/src/enums/simpletypes/usebase64.h b/src/enums/simpletypes/usebase64.h
index f66dda29a..47ab0bead 100644
--- a/src/enums/simpletypes/usebase64.h
+++ b/src/enums/simpletypes/usebase64.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(UseBase64);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_USEBASE64_H
diff --git a/src/enums/simpletypes/useresman.h b/src/enums/simpletypes/useresman.h
index 27d22b1d8..2cac99eb1 100644
--- a/src/enums/simpletypes/useresman.h
+++ b/src/enums/simpletypes/useresman.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(UseResman);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_USERESMAN_H
diff --git a/src/enums/simpletypes/visible.h b/src/enums/simpletypes/visible.h
index 02e19a35f..962d1ddf2 100644
--- a/src/enums/simpletypes/visible.h
+++ b/src/enums/simpletypes/visible.h
@@ -23,6 +23,11 @@
#include "enums/simpletypes/booldefines.h"
+PRAGMA6("GCC diagnostic push")
+PRAGMA6("GCC diagnostic ignored \"-Wunused-const-variable\"")
+
defBoolEnum(Visible);
+PRAGMA6("GCC diagnostic pop")
+
#endif // ENUMS_SIMPLETYPES_VISIBLE_H
diff --git a/src/localconsts.h b/src/localconsts.h
index c005e47d8..28d6ab5bc 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -116,8 +116,14 @@
#ifdef ADVGCC
#define const2 const
+#if GCC_VERSION >= 60000
+#define PRAGMA6(str) _Pragma(str)
+#else // GCC_VERSION > 60000
+#define PRAGMA6(str)
+#endif // GCC_VERSION > 60000
#else // ADVGCC
#define const2
+#define PRAGMA6(str)
#endif // ADVGCC
#ifdef __GNUC__