From a57df05fd0e538d6782bca4cfce87ddaf0177a91 Mon Sep 17 00:00:00 2001 From: conrad Date: Thu, 3 Jul 2025 15:55:34 +1000 Subject: [PATCH] use C++14 features by default --- include/armadillo_bits/compiler_setup.hpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/include/armadillo_bits/compiler_setup.hpp b/include/armadillo_bits/compiler_setup.hpp index 805a6f2d..8f908fa4 100644 --- a/include/armadillo_bits/compiler_setup.hpp +++ b/include/armadillo_bits/compiler_setup.hpp @@ -34,8 +34,8 @@ #define arma_aligned #define arma_align_mem #define arma_warn_unused -#define arma_deprecated -#define arma_frown(msg) +#define arma_deprecated [[deprecated]] +#define arma_frown(msg) [[deprecated(msg)]] #define arma_malloc #define arma_inline inline #define arma_noinline @@ -368,15 +368,6 @@ #endif -#if defined(ARMA_HAVE_CXX14) - #undef arma_deprecated - #define arma_deprecated [[deprecated]] - - #undef arma_frown - #define arma_frown(msg) [[deprecated(msg)]] -#endif - - #if defined(ARMA_HAVE_CXX17) #undef arma_warn_unused #define arma_warn_unused [[nodiscard]]