Skip to content

Commit e8b7a44

Browse files
committed
RcppArmadillo 14.90.0-3
1 parent 35213a5 commit e8b7a44

File tree

4 files changed

+40
-0
lines changed

4 files changed

+40
-0
lines changed

ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
2025-08-14 Dirk Eddelbuettel <[email protected]>
22

33
* DESCRIPTION (Version, Date): RcppArmadillo 14.6.3-1
4+
* inst/include/current/armadillo_bits/*: Re-synced with Armadillo
5+
6+
* DESCRIPTION (Version, Date): RcppArmadillo 14.90.0-3
7+
* inst/NEWS.Rd: Idem
8+
* configure.ac: Idem
9+
* configure: Idem
10+
411
2025-08-10 Dirk Eddelbuettel <[email protected]>
512

613
* DESCRIPTION (Version, Date): RcppArmadillo 14.90.0-2
@@ -10,6 +17,7 @@
1017

1118
* inst/include/armadillo_bits/: Armadillo 14.6.3
1219
* inst/include/current/: Armadillo 15.0.0 (pre-rc)
20+
* inst/include/current/: Armadillo 14.90.0
1321
* inst/include/legacy/: Armadillo 14.6.2
1422
* inst/include/RcppArmadillo/interface/RcppArmadilloForward.h: Switch
1523
back to 'legacy' if compilation standard is older than C++14

DESCRIPTION

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Version: 14.6.3-1
55
Date: 2025-08-14
66
Version: 14.90.0-2
77
Date: 2025-08-10
8+
Version: 14.90.0-3
9+
Date: 2025-08-14
810
Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "[email protected]",
911
comment = c(ORCID = "0000-0001-6419-907X")),
1012
person("Romain", "Francois", role = "aut",

configure

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,12 +604,17 @@ MAKEFLAGS=
604604
PACKAGE_NAME='RcppArmadillo'
605605
PACKAGE_TARNAME='rcpparmadillo'
606606
<<<<<<< HEAD
607+
<<<<<<< HEAD
607608
PACKAGE_VERSION='14.6.3-1'
608609
PACKAGE_STRING='RcppArmadillo 14.6.3-1'
609610
=======
610611
PACKAGE_VERSION='14.90.0-2'
611612
PACKAGE_STRING='RcppArmadillo 14.90.0-2'
612613
>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
614+
=======
615+
PACKAGE_VERSION='14.90.0-3'
616+
PACKAGE_STRING='RcppArmadillo 14.90.0-3'
617+
>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
613618
PACKAGE_BUGREPORT='[email protected]'
614619
PACKAGE_URL=''
615620

@@ -1228,10 +1233,14 @@ if test "$ac_init_help" = "long"; then
12281233
# This message is too long to be a string in the A/UX 3.1 sh.
12291234
cat <<_ACEOF
12301235
<<<<<<< HEAD
1236+
<<<<<<< HEAD
12311237
'configure' configures RcppArmadillo 14.6.3-1 to adapt to many kinds of systems.
12321238
=======
12331239
'configure' configures RcppArmadillo 14.90.0-2 to adapt to many kinds of systems.
12341240
>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
1241+
=======
1242+
'configure' configures RcppArmadillo 14.90.0-3 to adapt to many kinds of systems.
1243+
>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
12351244
12361245
Usage: $0 [OPTION]... [VAR=VALUE]...
12371246
@@ -1293,11 +1302,15 @@ fi
12931302

12941303
if test -n "$ac_init_help"; then
12951304
case $ac_init_help in
1305+
<<<<<<< HEAD
12961306
<<<<<<< HEAD
12971307
short | recursive ) echo "Configuration of RcppArmadillo 14.6.3-1:";;
12981308
=======
12991309
short | recursive ) echo "Configuration of RcppArmadillo 14.90.0-2:";;
13001310
>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
1311+
=======
1312+
short | recursive ) echo "Configuration of RcppArmadillo 14.90.0-3:";;
1313+
>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
13011314
esac
13021315
cat <<\_ACEOF
13031316
@@ -1379,10 +1392,14 @@ test -n "$ac_init_help" && exit $ac_status
13791392
if $ac_init_version; then
13801393
cat <<\_ACEOF
13811394
<<<<<<< HEAD
1395+
<<<<<<< HEAD
13821396
RcppArmadillo configure 14.6.3-1
13831397
=======
13841398
RcppArmadillo configure 14.90.0-2
13851399
>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
1400+
=======
1401+
RcppArmadillo configure 14.90.0-3
1402+
>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
13861403
generated by GNU Autoconf 2.72
13871404
13881405
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1498,11 +1515,15 @@ cat >config.log <<_ACEOF
14981515
This file contains any messages produced by compilers while
14991516
running configure, to aid debugging if configure makes a mistake.
15001517
1518+
<<<<<<< HEAD
15011519
<<<<<<< HEAD
15021520
It was created by RcppArmadillo $as_me 14.6.3-1, which was
15031521
=======
15041522
It was created by RcppArmadillo $as_me 14.90.0-2, which was
15051523
>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
1524+
=======
1525+
It was created by RcppArmadillo $as_me 14.90.0-3, which was
1526+
>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
15061527
generated by GNU Autoconf 2.72. Invocation command line was
15071528
15081529
$ $0$ac_configure_args_raw
@@ -4002,10 +4023,14 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
40024023
# values after options handling.
40034024
ac_log="
40044025
<<<<<<< HEAD
4026+
<<<<<<< HEAD
40054027
This file was extended by RcppArmadillo $as_me 14.6.3-1, which was
40064028
=======
40074029
This file was extended by RcppArmadillo $as_me 14.90.0-2, which was
40084030
>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
4031+
=======
4032+
This file was extended by RcppArmadillo $as_me 14.90.0-3, which was
4033+
>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
40094034
generated by GNU Autoconf 2.72. Invocation command line was
40104035
40114036
CONFIG_FILES = $CONFIG_FILES
@@ -4061,10 +4086,14 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
40614086
ac_cs_config='$ac_cs_config_escaped'
40624087
ac_cs_version="\\
40634088
<<<<<<< HEAD
4089+
<<<<<<< HEAD
40644090
RcppArmadillo config.status 14.6.3-1
40654091
=======
40664092
RcppArmadillo config.status 14.90.0-2
40674093
>>>>>>> 04afddb3 (RcppArmadillo 14.90.0-2 with Armadillo 14.90.0 (15.0.rc) and 14.6.2)
4094+
=======
4095+
RcppArmadillo config.status 14.90.0-3
4096+
>>>>>>> 669ad971 (RcppArmadillo 14.90.0-3)
40684097
configured by $0, generated by GNU Autoconf 2.72,
40694098
with options \\"\$ac_cs_config\\"
40704099

inst/NEWS.Rd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
\section{Changes in RcppArmadillo version 14.6.2-1 (2025-08-08) (GitHub Only)}{
1616
\section{Changes in RcppArmadillo version 14.90.0-2 (2025-08-10) (GitHub Only)}{
17+
\section{Changes in RcppArmadillo version 14.90.0-3 (2025-08-14) (GitHub Only)}{
1718
\itemize{
1819
\item Upgraded to Armadillo release 14.90.0 (Experimental)
1920
\item Also include Armadillo 14.6.2 as fallback for C++11 compilations

0 commit comments

Comments
 (0)