No longer include the system headers first

With the Wsystem-headers warning removed, these are no longer needed
and can instead be included on first-use again.
This commit is contained in:
Ian McInerney 2021-04-22 19:23:48 +01:00
parent b47189b945
commit e0005c1d93

View File

@ -33,55 +33,9 @@
_Pragma(STRINGIZE(GCC diagnostic ignored STRINGIZE(CONCAT(-W,warn))))
#endif
// Due to what looks like a bug in gcc, some warnings enabled after including
// the standard headers still result in warnings being given when instantiating
// some functions defined in these headers later and we need to explicitly
// disable these warnings to avoid them, even if they're not enabled yet.
#ifdef GCC_TURN_OFF
#pragma GCC diagnostic push
GCC_TURN_OFF(aggregate-return)
GCC_TURN_OFF(conversion)
GCC_TURN_OFF(format)
GCC_TURN_OFF(padded)
GCC_TURN_OFF(parentheses)
GCC_TURN_OFF(sign-compare)
GCC_TURN_OFF(sign-conversion)
GCC_TURN_OFF(unused-parameter)
GCC_TURN_OFF(zero-as-null-pointer-constant)
#endif
// We have to include this one first in order to check for HAVE_XXX below.
#include "wx/setup.h"
// Include all standard headers that are used in wx headers before enabling the
// warnings below.
#include <algorithm>
#include <cmath>
#include <exception>
#include <functional>
#include <iomanip>
#include <iostream>
#include <list>
#include <locale>
#include <map>
#include <set>
#include <sstream>
#include <string>
#include <vector>
#if defined(HAVE_STD_UNORDERED_MAP)
#include <unordered_map>
#endif
#if defined(HAVE_STD_UNORDERED_SET)
#include <unordered_set>
#endif
#if defined(HAVE_DLOPEN)
#include <dlfcn.h>
#endif
#include <fcntl.h>
#include "catch.hpp"
#if defined(__WXMSW__)
@ -99,9 +53,6 @@
#include <QtGui/QFont>
#endif
#ifdef GCC_TURN_OFF
#pragma GCC diagnostic pop
#endif
// Enable max warning level for headers if possible, using gcc pragmas.
#ifdef GCC_TURN_ON