From aa4df026d44bd205f8bfce8a3b8d6a1144332f32 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Mon, 30 Jun 2014 19:30:49 -0700
Subject: Finally get around to decoupling the warning system

---
 src/map/battle.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/map/battle.cpp')

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;
-- 
cgit v1.2.3-70-g09d2