From 54394e2c2f0029aa1f767ac895829d4070616328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 29 Mar 2022 11:19:52 +0200 Subject: [PATCH] Trade: fix deprecated build on MSVC. As the CI only uses Linux to test non-deprecated builds, this was unfortunately not caught -- there std::string is forward-declared in , which is included by Debug.h, which is transitively included by Pointer. On MSVC however a full has to be included always. Co-authored-by: EhWhoAmI --- src/Magnum/Trade/AbstractImageConverter.h | 6 ++++++ src/Magnum/Trade/AbstractSceneConverter.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/Magnum/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h index bc7bf0194..728b87618 100644 --- a/src/Magnum/Trade/AbstractImageConverter.h +++ b/src/Magnum/Trade/AbstractImageConverter.h @@ -35,6 +35,12 @@ #include "Magnum/Trade/Trade.h" #include "Magnum/Trade/visibility.h" +#ifdef MAGNUM_BUILD_DEPRECATED +/* So deprecated APIs taking a std::string don't fail to compile */ +/** @todo remove once they are gone */ +#include +#endif + namespace Magnum { namespace Trade { /** diff --git a/src/Magnum/Trade/AbstractSceneConverter.h b/src/Magnum/Trade/AbstractSceneConverter.h index e593c36e3..fba0a3f26 100644 --- a/src/Magnum/Trade/AbstractSceneConverter.h +++ b/src/Magnum/Trade/AbstractSceneConverter.h @@ -36,6 +36,12 @@ #include "Magnum/Trade/Trade.h" #include "Magnum/Trade/visibility.h" +#ifdef MAGNUM_BUILD_DEPRECATED +/* So deprecated APIs taking a std::string don't fail to compile */ +/** @todo remove once they are gone */ +#include +#endif + namespace Magnum { namespace Trade { /**