summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-09-25 20:52:36 +0300
committerAndrei Karas <akaras@inbox.ru>2019-10-17 03:30:39 +0300
commit1bc17b805aec9dff503afca1e4b7120c5c836b75 (patch)
tree650394991a8f5d924a936aa5c2e9cbaf2ed77c6b /src/map
parent5b2f2fd6edbc13c2ba7ea777ceb205294899b72b (diff)
downloadhercules-1bc17b805aec9dff503afca1e4b7120c5c836b75.tar.gz
hercules-1bc17b805aec9dff503afca1e4b7120c5c836b75.tar.bz2
hercules-1bc17b805aec9dff503afca1e4b7120c5c836b75.tar.xz
hercules-1bc17b805aec9dff503afca1e4b7120c5c836b75.zip
Fix compilation warnings in gcc-9
Also reenabled array bound warning
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c3
-rw-r--r--src/map/map.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index f6caa502e..3e6a3469d 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -16091,7 +16091,10 @@ static void clif_ranklist(struct map_session_data *sd, enum fame_list_type type)
p->packetType = HEADER_ZC_ACK_RANKING;
p->rankType = type;
#if PACKETVER_MAIN_NUM >= 20190731 || PACKETVER_RE_NUM >= 20190703 || PACKETVER_ZERO_NUM >= 20190724
+PRAGMA_GCC9(GCC diagnostic push)
+PRAGMA_GCC9(GCC diagnostic ignored "-Waddress-of-packed-member")
clif->ranklist_sub2(p->chars, p->points, type);
+PRAGMA_GCC9(GCC diagnostic pop)
#else
clif->ranklist_sub(&p->ranks, type);
#endif
diff --git a/src/map/map.c b/src/map/map.c
index 332bbe75f..f3fc9d46b 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -6835,7 +6835,10 @@ void map_defaults(void)
map->bl_list_size = 0;
//all in a big chunk, respects order
+PRAGMA_GCC9(GCC diagnostic push)
+PRAGMA_GCC9(GCC diagnostic ignored "-Warray-bounds")
memset(ZEROED_BLOCK_POS(map), 0, ZEROED_BLOCK_SIZE(map));
+PRAGMA_GCC9(GCC diagnostic pop)
map->cpsd = NULL;
map->list = NULL;