diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-30 19:30:49 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-06-30 20:57:13 -0700 |
| commit | aa4df026d44bd205f8bfce8a3b8d6a1144332f32 (patch) | |
| tree | 397692da57b2be8f7c083989ed37fb03308d5b2c /src/map/magic-interpreter-base.cpp | |
| parent | 7c5c2058e9aea996dc6c76a7e6d9ba4fc2a2bc77 (diff) | |
| download | tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.tar.gz tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.tar.bz2 tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.tar.xz tmwa-aa4df026d44bd205f8bfce8a3b8d6a1144332f32.zip | |
Finally get around to decoupling the warning system
Diffstat (limited to 'src/map/magic-interpreter-base.cpp')
| -rw-r--r-- | src/map/magic-interpreter-base.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 }; |