In order to disable them, diagnostic header must be public and included

6 files changed, 14 insertions, 7 deletions

diff --git a/src/warning_list.hpp b/src/diagnostics.hpp
index 6b45375..31596dc 100644
--- a/src/warning_list.hpp
+++ b/src/diagnostics.hpp
@@ -1,5 +1,5 @@
 #pragma once
-//    warning_list.hpp - List of useful warnings.
+//    diagnostics.hpp - List of useful warnings and macros to control them.
 //
 //    Copyright © 2013-2014 Ben Longbons <b.r.longbons@gmail.com>
 //
@@ -59,11 +59,6 @@ namespace tmwa
 # define PRAGMA(x) static_assert(1, "pragmas not available, can't do: " #x)
 #endif
 
-PRAGMA(GCC diagnostic warning "-Wall");
-PRAGMA(GCC diagnostic warning "-Wextra");
-PRAGMA(GCC diagnostic warning "-Wunused");
-PRAGMA(GCC diagnostic warning "-Wformat");
-
 #define DIAG_E(tag) DO_DIAG_IF(HAS_DIAG_##tag)(error, DIAG_##tag)
 #define DIAG_W(tag) DO_DIAG_IF(HAS_DIAG_##tag)(warning, DIAG_##tag)
 #define DIAG_I(tag) DO_DIAG_IF(HAS_DIAG_##tag)(ignored, DIAG_##tag)
diff --git a/src/ints/cmp.hpp b/src/ints/cmp.hpp
index 58a33b4..08308e1 100644
--- a/src/ints/cmp.hpp
+++ b/src/ints/cmp.hpp
@@ -22,6 +22,8 @@
 
 #include <limits>
 
+#include "../diagnostics.hpp"
+
 
 namespace tmwa
 {
diff --git a/src/ints/udl_test.cpp b/src/ints/udl_test.cpp
index 3fa9c31..279edde 100644
--- a/src/ints/udl_test.cpp
+++ b/src/ints/udl_test.cpp
@@ -22,6 +22,7 @@
 
 #include "../compat/cast.hpp"
 
+#include "../diagnostics.hpp"
 #include "../poison.hpp"
 
 
diff --git a/src/io/cxxstdio.hpp b/src/io/cxxstdio.hpp
index a8343c0..20d3a33 100644
--- a/src/io/cxxstdio.hpp
+++ b/src/io/cxxstdio.hpp
@@ -27,6 +27,8 @@
 
 #include "../generic/enum.hpp"
 
+#include "../diagnostics.hpp"
+
 
 namespace tmwa
 {
diff --git a/src/io/fd.hpp b/src/io/fd.hpp
index f1d1751..6fb745d 100644
--- a/src/io/fd.hpp
+++ b/src/io/fd.hpp
@@ -25,6 +25,8 @@
 
 #include "../strings/fwd.hpp"
 
+#include "../diagnostics.hpp"
+
 
 namespace tmwa
 {
diff --git a/src/warnings.hpp b/src/warnings.hpp
index e5fcf2d..9389766 100644
--- a/src/warnings.hpp
+++ b/src/warnings.hpp
@@ -23,11 +23,16 @@
 
 // just mention "fwd.hpp" to make formatter happy
 
-#include "warning_list.hpp"
+#include "diagnostics.hpp"
 
 
 namespace tmwa
 {
+PRAGMA(GCC diagnostic warning "-Wall");
+PRAGMA(GCC diagnostic warning "-Wextra");
+PRAGMA(GCC diagnostic warning "-Wunused");
+PRAGMA(GCC diagnostic warning "-Wformat");
+
 DIAG_E(abi);
 DIAG_W(abi_tag);
 DIAG_E(address);