diff --git a/include/armadillo_bits/compiler_check.hpp b/include/armadillo_bits/compiler_check.hpp index fcf651ab..3fac47fb 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)) && (!defined(ARMA_IGNORE_DEPRECATED_MARKER)) +#if (!defined(ARMA_HAVE_CXX14)) #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 3176a50c..37aa6dca 100644 --- a/include/armadillo_bits/compiler_setup.hpp +++ b/include/armadillo_bits/compiler_setup.hpp @@ -477,14 +477,7 @@ #undef major -// optionally allow disabling of compile-time deprecation messages (not recommended) -// NOTE: option 'ARMA_IGNORE_DEPRECATED_MARKER' will be removed -// NOTE: disabling deprecation messages is counter-productive - +// 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) + #pragma message("NOTE: support for ARMA_IGNORE_DEPRECATED_MARKER has been removed") #endif diff --git a/include/armadillo_bits/config.hpp b/include/armadillo_bits/config.hpp index 46d755bc..56b399e7 100644 --- a/include/armadillo_bits/config.hpp +++ b/include/armadillo_bits/config.hpp @@ -333,10 +333,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 @@ -354,8 +350,6 @@ #undef ARMA_WARN_LEVEL #define ARMA_WARN_LEVEL 3 - - #undef ARMA_IGNORE_DEPRECATED_MARKER #endif #if defined(ARMA_DONT_PRINT_EXCEPTIONS) @@ -367,9 +361,7 @@ #endif #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 82603d1b..cc556e67 100644 --- a/include/armadillo_bits/config.hpp.cmake +++ b/include/armadillo_bits/config.hpp.cmake @@ -333,10 +333,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 @@ -354,8 +350,6 @@ #undef ARMA_WARN_LEVEL #define ARMA_WARN_LEVEL 3 - - #undef ARMA_IGNORE_DEPRECATED_MARKER #endif #if defined(ARMA_DONT_PRINT_EXCEPTIONS) @@ -367,9 +361,7 @@ #endif #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