From 2173668e0973911d0743995254ed9e7deea69339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 24 Mar 2019 22:20:49 +0100 Subject: [PATCH] singles: use Corrade's StlMath.h in MagnumMath.hpp. --- src/singles/MagnumMath.hpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/singles/MagnumMath.hpp b/src/singles/MagnumMath.hpp index c056c28a4..771c27c90 100644 --- a/src/singles/MagnumMath.hpp +++ b/src/singles/MagnumMath.hpp @@ -21,7 +21,17 @@ */ #include "base.h" +/* Put the contents of Corrade/Utility/StlMath.h here so it doesn't get + reordered */ +#pragma ACME enable Corrade_Utility_StlMath_h // {{includes}} +#include +#ifdef _GLIBCXX_USE_STD_SPEC_FUNCS +#undef _GLIBCXX_USE_STD_SPEC_FUNCS +#define _GLIBCXX_USE_STD_SPEC_FUNCS 0 +#endif +// {{includes}} +#include #if (!defined(CORRADE_ASSERT) || !defined(CORRADE_CONSTEXPR_ASSERT) || !defined(CORRADE_INTERNAL_ASSERT_OUTPUT) || !defined(CORRADE_ASSERT_UNREACHABLE)) && !defined(NDEBUG) #include #endif