Skip to content

Provides armadillo header for direct include #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eddelbuettel merged 1 commit into from
Sep 3, 2025
Merged

Provides armadillo header for direct include #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2025-09-02 Dirk Eddelbuettel <edd@debian.org>

* inst/include/armadillo: Moved back up from legacy/ to restore path
* inst/include/armadillo_bits/: Idem


2025-09-01 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): RcppArmadillo 15.0.1-1
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: RcppArmadillo
Type: Package
Title: 'Rcpp' Integration for the 'Armadillo' Templated Linear Algebra Library
Version: 15.0.1-1
Date: 2025-09-01
Version: 15.0.1-2
Date: 2025-09-02
Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org",
comment = c(ORCID = "0000-0001-6419-907X")),
person("Romain", "Francois", role = "aut",
Expand Down
37 changes: 37 additions & 0 deletions inst/include/armadillo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@

// Replacement header providing the original path so that '#include <armadillo>' works
// with the R package -- but it is recommended to include only the RcppArmadillo header


#ifndef RcppArmadillo__armadillo__h
#define RcppArmadillo__armadillo__h

// See version/arma.h header for the (user and/or compilation) drive selection of these defines
#if defined(ARMA_SELECTED_CURRENT_VERSION)

// we include Armadillo 15.0.1 here -- but do it quietly
//#pragma message("Using compilation with current Armadillo version.")

// Armadillo 15.0.1 or later
#include "current/armadillo"

#else

// we include Armadillo 14.6.3 here -- but do it quietly
//#pragma message("Using fallback compilation with Armadillo 14.6.3.")

// 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 again for Armadillo 14.6.* as too many packages trigger this
#define ARMA_IGNORE_DEPRECATED_MARKER

#include "legacy/armadillo"

#endif

#endif