Skip to content

Commit 04afddb

Browse files
committed
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
1 parent 3df665d commit 04afddb

File tree

1,301 files changed

+207660
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,301 files changed

+207660
-23
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ GPATH
1212
GRTAGS
1313
GTAGS
1414
inst/include/armadillo_bits/config.hpp.cmake
15+
inst/include/current/armadillo_bits/config.hpp.cmake

ChangeLog

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2025-08-10 Dirk Eddelbuettel <[email protected]>
2+
3+
* DESCRIPTION (Version, Date): RcppArmadillo 14.90.0-2
4+
* inst/NEWS.Rd: Idem
5+
* configure.ac: Idem
6+
* configure: Idem
7+
8+
* inst/include/current/: Armadillo 15.0.0 (pre-rc)
9+
* inst/include/legacy/: Armadillo 14.6.2
10+
* inst/include/RcppArmadillo/interface/RcppArmadilloForward.h: Switch
11+
back to 'legacy' if compilation standard is older than C++14
12+
113
2025-08-09 Dirk Eddelbuettel <[email protected]>
214

315
* DESCRIPTION (Version, Date): RcppArmadillo 14.6.2-1

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: RcppArmadillo
22
Type: Package
33
Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
4-
Version: 14.6.2-1
5-
Date: 2025-08-08
4+
Version: 14.90.0-2
5+
Date: 2025-08-10
66
Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "[email protected]",
77
comment = c(ORCID = "0000-0001-6419-907X")),
88
person("Romain", "Francois", role = "aut",

configure

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.72 for RcppArmadillo 14.6.2-1.
3+
# Generated by GNU Autoconf 2.72 for RcppArmadillo 14.90.0-2.
44
#
55
# Report bugs to <[email protected]>.
66
#
@@ -603,8 +603,8 @@ MAKEFLAGS=
603603
# Identity of this package.
604604
PACKAGE_NAME='RcppArmadillo'
605605
PACKAGE_TARNAME='rcpparmadillo'
606-
PACKAGE_VERSION='14.6.2-1'
607-
PACKAGE_STRING='RcppArmadillo 14.6.2-1'
606+
PACKAGE_VERSION='14.90.0-2'
607+
PACKAGE_STRING='RcppArmadillo 14.90.0-2'
608608
PACKAGE_BUGREPORT='[email protected]'
609609
PACKAGE_URL=''
610610

@@ -1222,7 +1222,7 @@ if test "$ac_init_help" = "long"; then
12221222
# Omit some internal or obsolete options to make the list less imposing.
12231223
# This message is too long to be a string in the A/UX 3.1 sh.
12241224
cat <<_ACEOF
1225-
'configure' configures RcppArmadillo 14.6.2-1 to adapt to many kinds of systems.
1225+
'configure' configures RcppArmadillo 14.90.0-2 to adapt to many kinds of systems.
12261226
12271227
Usage: $0 [OPTION]... [VAR=VALUE]...
12281228
@@ -1284,7 +1284,7 @@ fi
12841284

12851285
if test -n "$ac_init_help"; then
12861286
case $ac_init_help in
1287-
short | recursive ) echo "Configuration of RcppArmadillo 14.6.2-1:";;
1287+
short | recursive ) echo "Configuration of RcppArmadillo 14.90.0-2:";;
12881288
esac
12891289
cat <<\_ACEOF
12901290
@@ -1365,7 +1365,7 @@ fi
13651365
test -n "$ac_init_help" && exit $ac_status
13661366
if $ac_init_version; then
13671367
cat <<\_ACEOF
1368-
RcppArmadillo configure 14.6.2-1
1368+
RcppArmadillo configure 14.90.0-2
13691369
generated by GNU Autoconf 2.72
13701370
13711371
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1481,7 +1481,7 @@ cat >config.log <<_ACEOF
14811481
This file contains any messages produced by compilers while
14821482
running configure, to aid debugging if configure makes a mistake.
14831483
1484-
It was created by RcppArmadillo $as_me 14.6.2-1, which was
1484+
It was created by RcppArmadillo $as_me 14.90.0-2, which was
14851485
generated by GNU Autoconf 2.72. Invocation command line was
14861486
14871487
$ $0$ac_configure_args_raw
@@ -3980,7 +3980,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
39803980
# report actual input values of CONFIG_FILES etc. instead of their
39813981
# values after options handling.
39823982
ac_log="
3983-
This file was extended by RcppArmadillo $as_me 14.6.2-1, which was
3983+
This file was extended by RcppArmadillo $as_me 14.90.0-2, which was
39843984
generated by GNU Autoconf 2.72. Invocation command line was
39853985
39863986
CONFIG_FILES = $CONFIG_FILES
@@ -4035,7 +4035,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
40354035
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
40364036
ac_cs_config='$ac_cs_config_escaped'
40374037
ac_cs_version="\\
4038-
RcppArmadillo config.status 14.6.2-1
4038+
RcppArmadillo config.status 14.90.0-2
40394039
configured by $0, generated by GNU Autoconf 2.72,
40404040
with options \\"\$ac_cs_config\\"
40414041

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
AC_PREREQ([2.69])
1212

1313
## Process this file with autoconf to produce a configure script.
14-
AC_INIT([RcppArmadillo],[14.6.2-1],[[email protected]])
14+
AC_INIT([RcppArmadillo],[14.90.0-2],[[email protected]])
1515

1616
## Set R_HOME, respecting an environment variable if one is set
1717
: ${R_HOME=$(R RHOME)}

inst/NEWS.Rd

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@
33
\newcommand{\ghpr}{\href{https://github.com/RcppCore/RcppArmadillo/pull/#1}{##1}}
44
\newcommand{\ghit}{\href{https://github.com/RcppCore/RcppArmadillo/issues/#1}{##1}}
55

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

inst/include/RcppArmadillo/interface/RcppArmadilloForward.h

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,24 @@
4646
// installation of Armadillo
4747
#define ARMA_DONT_USE_WRAPPER
4848

49-
// Armadillo has deprecation warnings (which RcppArmadillo suppressed at time to
50-
// minimise issies at CRAN). Should your package display any, and you decide
51-
// _not_ to fix the root causes (see RcppArmadillo GitHub Issues #391 and #402
52-
// for details) then defining the following macro will help. You can add a
53-
// #define in your source code before including the RcppArmadillo header, or add
54-
// a -DARMA_IGNORE_DEPRECATED_MARKER to the PKG_CPPFLAGS in src/Makevars.
55-
// Renabling globally for 14.0.0 release
56-
#define ARMA_IGNORE_DEPRECATED_MARKER
57-
58-
#include "armadillo"
49+
#if __cplusplus >= 201402L
50+
// Armadillo 15.0 (rc)
51+
#include "current/armadillo"
52+
#else
53+
// we include Armadillo 14.6.2 here -- the last version to not require C++14
54+
#pragma message("Using fallback compilation with Armadillo 14.6.2 under C++11. Please consider removing the C++11 compilation standard directive.")
55+
56+
// Armadillo has deprecation warnings (which RcppArmadillo suppressed at time to
57+
// minimise issies at CRAN). Should your package display any, and you decide
58+
// _not_ to fix the root causes (see RcppArmadillo GitHub Issues #391 and #402
59+
// for details) then defining the following macro will help. You can add a
60+
// #define in your source code before including the RcppArmadillo header, or add
61+
// a -DARMA_IGNORE_DEPRECATED_MARKER to the PKG_CPPFLAGS in src/Makevars.
62+
// Renabling globally for Armadillo 14.6.2 release
63+
#define ARMA_IGNORE_DEPRECATED_MARKER
64+
65+
#include "legacy/armadillo"
66+
#endif
5967

6068
/* forward declarations */
6169
namespace Rcpp {
File renamed without changes.

0 commit comments

Comments
 (0)