RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2

Adds fallback compilation using 14.6.2 installed in inst/include/legacy/
otherwise current version is used (requiring C++14 or newer) from
inst/include/current

Author: eddelbuettel

.gitignore

@@ -12,3 +12,4 @@ GPATH
 GRTAGS
 GTAGS
 inst/include/armadillo_bits/config.hpp.cmake
+inst/include/current/armadillo_bits/config.hpp.cmake

ChangeLog

@@ -1,11 +1,18 @@
 2025-08-14  Dirk Eddelbuettel  <[email protected]>
 
 	* DESCRIPTION (Version, Date): RcppArmadillo 14.6.3-1
+2025-08-10  Dirk Eddelbuettel  <[email protected]>
+
+	* DESCRIPTION (Version, Date): RcppArmadillo 14.90.0-2
         * inst/NEWS.Rd: Idem
         * configure.ac: Idem
         * configure: Idem
 
 	* inst/include/armadillo_bits/: Armadillo 14.6.3
+	* inst/include/current/: Armadillo 15.0.0 (pre-rc)
+	* inst/include/legacy/: Armadillo 14.6.2
+	* inst/include/RcppArmadillo/interface/RcppArmadilloForward.h: Switch
+	back to 'legacy' if compilation standard is older than C++14
 
 2025-08-09  Dirk Eddelbuettel  <[email protected]>
 

DESCRIPTION

@@ -3,6 +3,8 @@ Type: Package
 Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
 Version: 14.6.3-1
 Date: 2025-08-14
+Version: 14.90.0-2
+Date: 2025-08-10
 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "[email protected]",
                     comment = c(ORCID = "0000-0001-6419-907X")),
              person("Romain", "Francois", role = "aut",

configure

@@ -603,8 +603,13 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='RcppArmadillo'
 PACKAGE_TARNAME='rcpparmadillo'
+<<<<<<< HEAD
 PACKAGE_VERSION='14.6.3-1'
 PACKAGE_STRING='RcppArmadillo 14.6.3-1'
+=======
+PACKAGE_VERSION='14.90.0-2'
+PACKAGE_STRING='RcppArmadillo 14.90.0-2'
+>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1222,7 +1227,11 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
+<<<<<<< HEAD
 'configure' configures RcppArmadillo 14.6.3-1 to adapt to many kinds of systems.
+=======
+'configure' configures RcppArmadillo 14.90.0-2 to adapt to many kinds of systems.
+>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1284,7 +1293,11 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
+<<<<<<< HEAD
      short | recursive ) echo "Configuration of RcppArmadillo 14.6.3-1:";;
+=======
+     short | recursive ) echo "Configuration of RcppArmadillo 14.90.0-2:";;
+>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
    esac
   cat <<\_ACEOF
 
@@ -1365,7 +1378,11 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
+<<<<<<< HEAD
 RcppArmadillo configure 14.6.3-1
+=======
+RcppArmadillo configure 14.90.0-2
+>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1481,7 +1498,11 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
+<<<<<<< HEAD
 It was created by RcppArmadillo $as_me 14.6.3-1, which was
+=======
+It was created by RcppArmadillo $as_me 14.90.0-2, which was
+>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3980,7 +4001,11 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
+<<<<<<< HEAD
 This file was extended by RcppArmadillo $as_me 14.6.3-1, which was
+=======
+This file was extended by RcppArmadillo $as_me 14.90.0-2, which was
+>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4035,7 +4060,11 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
+<<<<<<< HEAD
 RcppArmadillo config.status 14.6.3-1
+=======
+RcppArmadillo config.status 14.90.0-2
+>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 
@@ -4595,5 +4624,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
-
-

inst/NEWS.Rd

@@ -13,6 +13,14 @@
 }
 
 \section{Changes in RcppArmadillo version 14.6.2-1 (2025-08-08) (GitHub Only)}{
+\section{Changes in RcppArmadillo version 14.90.0-2 (2025-08-10) (GitHub Only)}{
+  \itemize{
+    \item Upgraded to Armadillo release 14.90.0 (Experimental)
+    \item Also include Armadillo 14.6.2 as fallback for C++11 compilations
+  }
+}
+
+\section{Changes in RcppArmadillo version 14.6.2-1 (2025-08-09) (GitHub Only)}{
   \itemize{
     \item Upgraded to Armadillo release 14.6.2 (Caffe Mocha)
     \itemize{

inst/include/RcppArmadillo/interface/RcppArmadilloForward.h

@@ -46,16 +46,24 @@
 // installation of Armadillo
 #define ARMA_DONT_USE_WRAPPER
 
-// Armadillo has deprecation warnings (which RcppArmadillo suppressed at time to
-// minimise issies at CRAN).  Should your package display any, and you decide
-// _not_ to fix the root causes (see RcppArmadillo GitHub Issues #391 and #402
-// for details) then defining the following macro will help. You can add a
-// #define in your source code before including the RcppArmadillo header, or add
-// a -DARMA_IGNORE_DEPRECATED_MARKER to the PKG_CPPFLAGS in src/Makevars.
-// Renabling globally for 14.0.0 release
-#define ARMA_IGNORE_DEPRECATED_MARKER
-
-#include "armadillo"
+#if __cplusplus >= 201402L
+    // Armadillo 15.0 (rc)
+    #include "current/armadillo"
+#else
+    // we include Armadillo 14.6.2 here -- the last version to not require C++14
+    #pragma message("Using fallback compilation with Armadillo 14.6.2 under C++11. Please consider removing the C++11 compilation standard directive.")
+
+    // Armadillo has deprecation warnings (which RcppArmadillo suppressed at time to
+    // minimise issies at CRAN).  Should your package display any, and you decide
+    // _not_ to fix the root causes (see RcppArmadillo GitHub Issues #391 and #402
+    // for details) then defining the following macro will help. You can add a
+    // #define in your source code before including the RcppArmadillo header, or add
+    // a -DARMA_IGNORE_DEPRECATED_MARKER to the PKG_CPPFLAGS in src/Makevars.
+    // Renabling globally for Armadillo 14.6.2 release
+    #define ARMA_IGNORE_DEPRECATED_MARKER
+
+    #include "legacy/armadillo"
+#endif
 
 /* forward declarations */
 namespace Rcpp {