From 0b20c8cb3c0b4831349e0b76495ad207630292aa Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 30 Jun 2017 03:23:23 +0300 Subject: Remove extra includes from headers. --- src/utils/buildhex.h | 2 ++ src/utils/sdlhelper.cpp | 1 + src/utils/sdlpixel.h | 2 -- src/utils/xml/libxml.cpp | 1 + src/utils/xml/pugixml.cpp | 1 + src/utils/xml/tinyxml2.cpp | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/utils') diff --git a/src/utils/buildhex.h b/src/utils/buildhex.h index 777d19784..6833e9528 100644 --- a/src/utils/buildhex.h +++ b/src/utils/buildhex.h @@ -25,6 +25,8 @@ #include "localconsts.h" +UTILS_CAST_H + PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") #ifndef SDL_BIG_ENDIAN diff --git a/src/utils/sdlhelper.cpp b/src/utils/sdlhelper.cpp index ccffdea22..dca31ab5e 100644 --- a/src/utils/sdlhelper.cpp +++ b/src/utils/sdlhelper.cpp @@ -24,6 +24,7 @@ #include "logger.h" +#include "utils/cast.h" #include "utils/stringutils.h" #if defined(USE_X11) && defined(USE_OPENGL) diff --git a/src/utils/sdlpixel.h b/src/utils/sdlpixel.h index 54e7e0b41..920ad4164 100644 --- a/src/utils/sdlpixel.h +++ b/src/utils/sdlpixel.h @@ -66,8 +66,6 @@ #include "gui/color.h" -#include "utils/cast.h" - PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") #include diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp index ea15cb6bb..90204fb49 100644 --- a/src/utils/xml/libxml.cpp +++ b/src/utils/xml/libxml.cpp @@ -26,6 +26,7 @@ #include "fs/virtfs/fs.h" +#include "utils/cast.h" #include "utils/checkutils.h" #include "utils/fuzzer.h" #include "utils/stringutils.h" diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp index bf94c3443..12ae1d794 100644 --- a/src/utils/xml/pugixml.cpp +++ b/src/utils/xml/pugixml.cpp @@ -26,6 +26,7 @@ #include "fs/virtfs/fs.h" +#include "utils/cast.h" #include "utils/checkutils.h" #include "utils/delete2.h" #include "utils/fuzzer.h" diff --git a/src/utils/xml/tinyxml2.cpp b/src/utils/xml/tinyxml2.cpp index c68059399..3a1646168 100644 --- a/src/utils/xml/tinyxml2.cpp +++ b/src/utils/xml/tinyxml2.cpp @@ -26,6 +26,7 @@ #include "fs/virtfs/fs.h" +#include "utils/cast.h" #include "utils/checkutils.h" #include "utils/fuzzer.h" #include "utils/stringutils.h" -- cgit v1.2.3-70-g09d2