From 06e4dae3322b7288a5e36d5ee7acffc063a458f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 30 Oct 2024 10:59:31 +0100 Subject: [PATCH] Text: forward-declare the nasty STL types. At the very least. The whole Renderer API needs to go, ugh. --- doc/snippets/Text-gl.cpp | 2 ++ src/Magnum/Text/Renderer.cpp | 3 +++ src/Magnum/Text/Renderer.h | 6 +++--- src/Magnum/Text/Test/RendererGLTest.cpp | 2 ++ src/Magnum/Text/Test/RendererTest.cpp | 3 +++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/snippets/Text-gl.cpp b/doc/snippets/Text-gl.cpp index ba933c949..54ec38c4d 100644 --- a/doc/snippets/Text-gl.cpp +++ b/doc/snippets/Text-gl.cpp @@ -24,6 +24,8 @@ DEALINGS IN THE SOFTWARE. */ +#include +#include #include #include diff --git a/src/Magnum/Text/Renderer.cpp b/src/Magnum/Text/Renderer.cpp index d22d61e7e..c27ec0471 100644 --- a/src/Magnum/Text/Renderer.cpp +++ b/src/Magnum/Text/Renderer.cpp @@ -38,6 +38,9 @@ #include "Magnum/Text/Direction.h" #ifdef MAGNUM_TARGET_GL +#include +#include +#include #include #include /** @todo remove once Renderer is STL-free */ #include /** @todo remove once Renderer is STL-free */ diff --git a/src/Magnum/Text/Renderer.h b/src/Magnum/Text/Renderer.h index fb6e71fb6..bedb3d869 100644 --- a/src/Magnum/Text/Renderer.h +++ b/src/Magnum/Text/Renderer.h @@ -35,9 +35,9 @@ #include "Magnum/Text/visibility.h" #ifdef MAGNUM_TARGET_GL -#include -#include -#include +#include +#include +#include #include "Magnum/DimensionTraits.h" #include "Magnum/Math/Range.h" diff --git a/src/Magnum/Text/Test/RendererGLTest.cpp b/src/Magnum/Text/Test/RendererGLTest.cpp index 6a845e57b..71dea772c 100644 --- a/src/Magnum/Text/Test/RendererGLTest.cpp +++ b/src/Magnum/Text/Test/RendererGLTest.cpp @@ -24,6 +24,8 @@ DEALINGS IN THE SOFTWARE. */ +#include +#include #include #include #include diff --git a/src/Magnum/Text/Test/RendererTest.cpp b/src/Magnum/Text/Test/RendererTest.cpp index fffdc3808..592a05c88 100644 --- a/src/Magnum/Text/Test/RendererTest.cpp +++ b/src/Magnum/Text/Test/RendererTest.cpp @@ -24,6 +24,9 @@ DEALINGS IN THE SOFTWARE. */ +#include +#include +#include #include #include #include