From e658f0db17d37d5aa53367a26ebef9259531dff4 Mon Sep 17 00:00:00 2001 From: conrad Date: Wed, 22 Jan 2025 23:23:02 +1000 Subject: [PATCH] restore old option for now --- include/armadillo_bits/compiler_check.hpp | 2 +- include/armadillo_bits/compiler_setup.hpp | 10 ++++++++-- include/armadillo_bits/config.hpp | 13 +++++++++++-- include/armadillo_bits/config.hpp.cmake | 13 +++++++++++-- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/include/armadillo_bits/compiler_check.hpp b/include/armadillo_bits/compiler_check.hpp index 3fac47fb..fcf651ab 100644 --- a/include/armadillo_bits/compiler_check.hpp +++ b/include/armadillo_bits/compiler_check.hpp @@ -83,7 +83,7 @@ #endif -#if (!defined(ARMA_HAVE_CXX14)) +#if (!defined(ARMA_HAVE_CXX14)) && (!defined(ARMA_IGNORE_DEPRECATED_MARKER)) #pragma message ("INFO: support for C++11 is deprecated; minimum recommended standard is C++14") #endif diff --git a/include/armadillo_bits/compiler_setup.hpp b/include/armadillo_bits/compiler_setup.hpp index 37aa6dca..aa52696f 100644 --- a/include/armadillo_bits/compiler_setup.hpp +++ b/include/armadillo_bits/compiler_setup.hpp @@ -477,7 +477,13 @@ #undef major -// disabling deprecation messages is counter-productive +// WARNING: option 'ARMA_IGNORE_DEPRECATED_MARKER' will be removed +// WARNING: disabling deprecation messages is counter-productive + #if defined(ARMA_IGNORE_DEPRECATED_MARKER) - #pragma message("NOTE: support for ARMA_IGNORE_DEPRECATED_MARKER has been removed") + #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 ee384185..46d77bc2 100644 --- a/include/armadillo_bits/config.hpp +++ b/include/armadillo_bits/config.hpp @@ -333,6 +333,10 @@ #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 @@ -350,6 +354,8 @@ #undef ARMA_WARN_LEVEL #define ARMA_WARN_LEVEL 3 + + #undef ARMA_IGNORE_DEPRECATED_MARKER #endif #if defined(ARMA_DONT_PRINT_EXCEPTIONS) @@ -360,10 +366,13 @@ #undef ARMA_CRIPPLED_LAPACK #endif -// WARNING: option ARMA_CRIPPLED_LAPACK will be removed +// WARNING: option ARMA_IGNORE_DEPRECATED_MARKER will be removed +// WARNING: option ARMA_CRIPPLED_LAPACK will be removed #if defined(ARMA_CRIPPLED_LAPACK) - #pragma message ("option ARMA_CRIPPLED_LAPACK is deprecated and will be removed") + #if (!defined(ARMA_IGNORE_DEPRECATED_MARKER)) + #pragma message ("option ARMA_CRIPPLED_LAPACK is deprecated and will be removed") + #endif #endif diff --git a/include/armadillo_bits/config.hpp.cmake b/include/armadillo_bits/config.hpp.cmake index bc4c099e..8bca46d8 100644 --- a/include/armadillo_bits/config.hpp.cmake +++ b/include/armadillo_bits/config.hpp.cmake @@ -333,6 +333,10 @@ #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 @@ -350,6 +354,8 @@ #undef ARMA_WARN_LEVEL #define ARMA_WARN_LEVEL 3 + + #undef ARMA_IGNORE_DEPRECATED_MARKER #endif #if defined(ARMA_DONT_PRINT_EXCEPTIONS) @@ -360,10 +366,13 @@ #undef ARMA_CRIPPLED_LAPACK #endif -// WARNING: option ARMA_CRIPPLED_LAPACK will be removed +// WARNING: option ARMA_IGNORE_DEPRECATED_MARKER will be removed +// WARNING: option ARMA_CRIPPLED_LAPACK will be removed #if defined(ARMA_CRIPPLED_LAPACK) - #pragma message ("option ARMA_CRIPPLED_LAPACK is deprecated and will be removed") + #if (!defined(ARMA_IGNORE_DEPRECATED_MARKER)) + #pragma message ("option ARMA_CRIPPLED_LAPACK is deprecated and will be removed") + #endif #endif