From 25f6093cef2b33a48e5a4e8fa2855e5a50313d4e Mon Sep 17 00:00:00 2001 From: conrad Date: Thu, 15 May 2025 13:33:25 +1000 Subject: [PATCH] conditionally undefine ARMA_IGNORE_DEPRECATED_MARKER --- include/armadillo_bits/compiler_setup.hpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/armadillo_bits/compiler_setup.hpp b/include/armadillo_bits/compiler_setup.hpp index b263899a..a5034d0e 100644 --- a/include/armadillo_bits/compiler_setup.hpp +++ b/include/armadillo_bits/compiler_setup.hpp @@ -172,6 +172,10 @@ #pragma message("INFO: support for GCC versions older than 8.1 is deprecated" #endif + #if (ARMA_GCC_VERSION >= 170000) + #undef ARMA_IGNORE_DEPRECATED_MARKER + #endif + #define ARMA_GOOD_COMPILER #undef arma_hot @@ -229,6 +233,12 @@ // #pragma message ("using Clang extensions") + #if defined(__clang_major__) && !defined(__apple_build_version__) + #if (__clang_major__ >= 24) + #undef ARMA_IGNORE_DEPRECATED_MARKER + #endif + #endif + #define ARMA_GOOD_COMPILER #if !defined(__has_attribute) @@ -477,7 +487,7 @@ #undef major -// WARNING: option 'ARMA_IGNORE_DEPRECATED_MARKER' will be removed; +// WARNING: option 'ARMA_IGNORE_DEPRECATED_MARKER' is not supported when compiling with gcc 17+ or clang 24+ // WARNING: disabling deprecation messages is counter-productive #if defined(ARMA_IGNORE_DEPRECATED_MARKER)