From 4364219179ebbbba8f2b091e1b310bf2a7dc9ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 16 Sep 2023 16:32:35 +0200 Subject: [PATCH] singles: MagnumMath actually doesn't need any is_trivially_* traits. And so neither STL implementation detection, nor CORRADE_CXX_STANDARD. --- src/singles/MagnumMath.hpp | 42 -------------------------------------- 1 file changed, 42 deletions(-) diff --git a/src/singles/MagnumMath.hpp b/src/singles/MagnumMath.hpp index 9193d8ac7..b69581bae 100644 --- a/src/singles/MagnumMath.hpp +++ b/src/singles/MagnumMath.hpp @@ -158,48 +158,6 @@ #define CORRADE_TARGET_ANDROID #endif -/* CORRADE_TARGET_LIBSTDCXX needed for CORRADE_STD_IS_TRIVIALLY_TRAITS_SUPPORTED, - and because it's so complex to check for it I can as well pull in the whole - thing */ -#pragma ACME enable Corrade_configure_h -#ifdef _MSC_VER -#ifdef _MSVC_LANG -#define CORRADE_CXX_STANDARD _MSVC_LANG -#else -#define CORRADE_CXX_STANDARD 201103L -#endif -#else -#define CORRADE_CXX_STANDARD __cplusplus -#endif -#if CORRADE_CXX_STANDARD >= 202002 -#include -#else -#include -#endif -#ifdef _LIBCPP_VERSION -#define CORRADE_TARGET_LIBCXX -#elif defined(_CPPLIB_VER) -#define CORRADE_TARGET_DINKUMWARE -#elif defined(__GLIBCXX__) -#define CORRADE_TARGET_LIBSTDCXX -/* GCC's provides the __GLIBCXX__ macro only since 6.1, so on older - versions we'll try to get it from bits/c++config.h */ -#elif defined(__has_include) - #if __has_include() - #include - #ifdef __GLIBCXX__ - #define CORRADE_TARGET_LIBSTDCXX - #endif - #endif -/* GCC < 5.0 doesn't have __has_include, so on these versions we'll just assume - it's libstdc++ as I don't think those versions are used with anything else - nowadays anyway. Clang reports itself as GCC 4.4, so exclude that one. */ -#elif defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 5 -#define CORRADE_TARGET_LIBSTDCXX -#else -/* Otherwise no idea. */ -#endif - #ifdef __GNUC__ #define CORRADE_TARGET_GCC #endif