Finally get around to decoupling the warning system

2 files changed, 9 insertions, 9 deletions

diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index c0459a7..eabe8a6 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -51,10 +51,10 @@ namespace tmwa
 {
 static Battle_Config init_battle_config();
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow"
+DIAG_PUSH();
+DIAG_I(shadow);
 struct Battle_Config battle_config = init_battle_config();
-#pragma GCC diagnostic pop
+DIAG_POP();
 
 /*==========================================
  * 自分をロックしている対象の数を返す(汎用)
@@ -2312,10 +2312,10 @@ int battle_check_range(dumb_ptr<block_list> src, dumb_ptr<block_list> bl,
 
 Battle_Config init_battle_config()
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow"
+    DIAG_PUSH();
+    DIAG_I(shadow);
     Battle_Config battle_config;
-#pragma GCC diagnostic pop
+    DIAG_POP();
     {
         battle_config.warp_point_debug = 0;
         battle_config.enemy_critical = 0;
diff --git a/src/map/magic-interpreter-base.cpp b/src/map/magic-interpreter-base.cpp
index fa53c51..768a7df 100644
--- a/src/map/magic-interpreter-base.cpp
+++ b/src/map/magic-interpreter-base.cpp
@@ -46,8 +46,8 @@ void set_int_p(val_t *v, int i, TYPE t)
 }
 
 #warning "This code should die"
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-macros"
+DIAG_PUSH();
+DIAG_I(unused_macros);
 
 #define set_int(v, i) set_int_p(v, i, TYPE::INT)
 #define set_dir(v, i) set_int_p(v, i, TYPE::DIR)
@@ -85,7 +85,7 @@ void set_spell SETTER(dumb_ptr<spell_t>, TYPE::SPELL, v_spell)
 #define set_env_invocation(v, x) setenv(set_invocation, v, x)
 #define set_env_spell(v, x) setenv(set_spell, v, x)
 
-#pragma GCC diagnostic pop
+DIAG_POP();
 
 magic_conf_t magic_conf;        /* Global magic conf */
 env_t magic_default_env = { &magic_conf, nullptr };