diff --git a/include/armadillo_bits/compiler_setup.hpp b/include/armadillo_bits/compiler_setup.hpp index 8e17425f..805a6f2d 100644 --- a/include/armadillo_bits/compiler_setup.hpp +++ b/include/armadillo_bits/compiler_setup.hpp @@ -162,10 +162,6 @@ #error "*** newer compiler required; need at least gcc 8.1 ***" #endif - #if (__GNUC__ >= 17) - #undef ARMA_IGNORE_DEPRECATED_MARKER - #endif - #define ARMA_GOOD_COMPILER #undef arma_hot @@ -223,12 +219,6 @@ // #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) @@ -474,15 +464,3 @@ // https://sourceware.org/bugzilla/show_bug.cgi?id=19239 #undef minor #undef major - - -// 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) - #undef arma_deprecated - #define arma_deprecated - - #undef arma_frown - #define arma_frown(msg) -#endif diff --git a/include/armadillo_bits/config.hpp b/include/armadillo_bits/config.hpp index f39aee53..926c7757 100644 --- a/include/armadillo_bits/config.hpp +++ b/include/armadillo_bits/config.hpp @@ -348,10 +348,6 @@ #undef ARMA_CHECK_NONFINITE #endif -#if defined(ARMA_DONT_IGNORE_DEPRECATED_MARKER) - #undef ARMA_IGNORE_DEPRECATED_MARKER -#endif - #if defined(ARMA_NO_DEBUG) #undef ARMA_DEBUG #undef ARMA_EXTRA_DEBUG @@ -369,8 +365,6 @@ #undef ARMA_WARN_LEVEL #define ARMA_WARN_LEVEL 3 - - #undef ARMA_IGNORE_DEPRECATED_MARKER #endif #if defined(ARMA_DONT_PRINT_EXCEPTIONS) @@ -381,13 +375,10 @@ #undef ARMA_CRIPPLED_LAPACK #endif -// WARNING: option ARMA_IGNORE_DEPRECATED_MARKER will be removed -// WARNING: option ARMA_CRIPPLED_LAPACK will be removed +// WARNING: option ARMA_CRIPPLED_LAPACK will be removed #if defined(ARMA_CRIPPLED_LAPACK) - #if (!defined(ARMA_IGNORE_DEPRECATED_MARKER)) - #pragma message ("option ARMA_CRIPPLED_LAPACK is deprecated and will be removed") - #endif + #pragma message ("option ARMA_CRIPPLED_LAPACK is deprecated and will be removed") #endif diff --git a/include/armadillo_bits/config.hpp.cmake b/include/armadillo_bits/config.hpp.cmake index 7ff5bcb7..d8bd5371 100644 --- a/include/armadillo_bits/config.hpp.cmake +++ b/include/armadillo_bits/config.hpp.cmake @@ -348,10 +348,6 @@ #undef ARMA_CHECK_NONFINITE #endif -#if defined(ARMA_DONT_IGNORE_DEPRECATED_MARKER) - #undef ARMA_IGNORE_DEPRECATED_MARKER -#endif - #if defined(ARMA_NO_DEBUG) #undef ARMA_DEBUG #undef ARMA_EXTRA_DEBUG @@ -369,8 +365,6 @@ #undef ARMA_WARN_LEVEL #define ARMA_WARN_LEVEL 3 - - #undef ARMA_IGNORE_DEPRECATED_MARKER #endif #if defined(ARMA_DONT_PRINT_EXCEPTIONS) @@ -381,13 +375,10 @@ #undef ARMA_CRIPPLED_LAPACK #endif -// WARNING: option ARMA_IGNORE_DEPRECATED_MARKER will be removed -// WARNING: option ARMA_CRIPPLED_LAPACK will be removed +// WARNING: option ARMA_CRIPPLED_LAPACK will be removed #if defined(ARMA_CRIPPLED_LAPACK) - #if (!defined(ARMA_IGNORE_DEPRECATED_MARKER)) - #pragma message ("option ARMA_CRIPPLED_LAPACK is deprecated and will be removed") - #endif + #pragma message ("option ARMA_CRIPPLED_LAPACK is deprecated and will be removed") #endif