From f1e256cdc2124fb3d3f5ab4abe002d6c0cd128a8 Mon Sep 17 00:00:00 2001 From: conrad Date: Mon, 7 Jul 2025 15:43:29 +1000 Subject: [PATCH] cleanup --- include/armadillo_bits/compiler_setup.hpp | 10 ---------- include/armadillo_bits/config.hpp | 2 +- include/armadillo_bits/config.hpp.cmake | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/include/armadillo_bits/compiler_setup.hpp b/include/armadillo_bits/compiler_setup.hpp index 814f61b3..0cdc3dd2 100644 --- a/include/armadillo_bits/compiler_setup.hpp +++ b/include/armadillo_bits/compiler_setup.hpp @@ -172,10 +172,6 @@ #pragma message("INFO: support for GCC versions older than 8.1 is deprecated") #endif - #if (ARMA_GCC_VERSION >= 180000) - #undef ARMA_IGNORE_DEPRECATED_MARKER - #endif - #define ARMA_GOOD_COMPILER #undef arma_hot @@ -233,12 +229,6 @@ // #pragma message ("using Clang extensions") - #if defined(__clang_major__) && !defined(__apple_build_version__) - #if (__clang_major__ >= 26) - #undef ARMA_IGNORE_DEPRECATED_MARKER - #endif - #endif - #define ARMA_GOOD_COMPILER #if !defined(__has_attribute) diff --git a/include/armadillo_bits/config.hpp b/include/armadillo_bits/config.hpp index 0aec1b18..4eddb621 100644 --- a/include/armadillo_bits/config.hpp +++ b/include/armadillo_bits/config.hpp @@ -378,9 +378,9 @@ #undef ARMA_CRIPPLED_LAPACK #endif + // WARNING: option ARMA_CRIPPLED_LAPACK is deprecated and will be removed // WARNING: option ARMA_IGNORE_DEPRECATED_MARKER is deprecated and will be removed -// WARNING: option ARMA_IGNORE_DEPRECATED_MARKER is not supported when compiling with gcc 18+ or clang 26+ // if Armadillo was installed on this system via CMake and ARMA_USE_WRAPPER is not defined, diff --git a/include/armadillo_bits/config.hpp.cmake b/include/armadillo_bits/config.hpp.cmake index ddddb506..ea032b79 100644 --- a/include/armadillo_bits/config.hpp.cmake +++ b/include/armadillo_bits/config.hpp.cmake @@ -378,9 +378,9 @@ #undef ARMA_CRIPPLED_LAPACK #endif + // WARNING: option ARMA_CRIPPLED_LAPACK is deprecated and will be removed // WARNING: option ARMA_IGNORE_DEPRECATED_MARKER is deprecated and will be removed -// WARNING: option ARMA_IGNORE_DEPRECATED_MARKER is not supported when compiling with gcc 18+ or clang 26+ // if Armadillo was installed on this system via CMake and ARMA_USE_WRAPPER is not defined,