Skip to content

Commit 6f96634

Browse files
eddelbuetteleddelbuettel
committed
Support Light, Lighter, Lightest (and 'normal') headers
1 parent 5128ece commit 6f96634

File tree

5 files changed

+140
-34
lines changed

5 files changed

+140
-34
lines changed

‎ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2022-10-14 Dirk Eddelbuettel <[email protected]>
2+
3+
* inst/include/RcppArmadillo/RcppArmadillo: Header accessing
4+
Rcpp/Rcpp, and not imposing column-as-matrix return
5+
* inst/include/RcppArmadillo/Light: Header accessing Rcpp/Light, idem
6+
* inst/include/RcppArmadillo/Lighter: Header accessing Rcpp/Lighter, idem
7+
* inst/include/RcppArmadillo/Lightest: Header accessing Rcpp/Lightest, idem
8+
19
2022-10-10 Dirk Eddelbuettel <[email protected]>
210

311
* DESCRIPTION (Version): RcppArmadillo 0.11.4.1.0

‎inst/include/RcppArmadillo/Light

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// Emacs, please make this -*- mode: C++; -*-
2+
3+
// RcppArmadillo: Rcpp/Armadillo glue
4+
//
5+
// Copyright (C) 2010 - 2022 Dirk Eddelbuettel, Romain Francois and Douglas Bates
6+
//
7+
// This file is part of RcppArmadillo.
8+
//
9+
// RcppArmadillo is free software: you can redistribute it and/or modify it
10+
// under the terms of the GNU General Public License as published by
11+
// the Free Software Foundation, either version 2 of the License, or
12+
// (at your option) any later version.
13+
//
14+
// RcppArmadillo is distributed in the hope that it will be useful, but
15+
// WITHOUT ANY WARRANTY; without even the implied warranty of
16+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
// GNU General Public License for more details.
18+
//
19+
// You should have received a copy of the GNU General Public License
20+
// along with RcppArmadillo. If not, see <http://www.gnu.org/licenses/>.
21+
22+
#ifndef RcppArmadillo__RcppArmadillo
23+
#define RcppArmadillo__RcppArmadillo
24+
25+
#if defined(Rcpp_hpp) && !defined(COMPILING_RCPPARMADILLO)
26+
#error "The file 'Rcpp.h' should not be included. Please correct to include only 'RcppArmadillo.h'."
27+
#endif
28+
29+
// We are undoing a design decision from early on by allowing vectors be returned
30+
// as standard 'one-dimension' objects -- as opposed to the matrix form we imposed
31+
#define RCPP_ARMADILLO_RETURN_ANYVEC_AS_VECTOR
32+
33+
// Set up actual #include <armadillo> after first #include <RcppArmadilloConfig> and more config
34+
#include <RcppArmadilloForward.h>
35+
36+
// Automatically include Rcpp as well -- but only the 'light' mode sans modules
37+
#include <Rcpp/Light>
38+
39+
// Remaining RcppArmadillo code
40+
#include <RcppArmadilloWrap.h>
41+
#include <RcppArmadilloAs.h>
42+
#include <RcppArmadilloSugar.h>
43+
44+
#endif

‎inst/include/RcppArmadillo/Lightest

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// Emacs, please make this -*- mode: C++; -*-
2+
3+
// RcppArmadillo: Rcpp/Armadillo glue
4+
//
5+
// Copyright (C) 2010 - 2022 Dirk Eddelbuettel, Romain Francois and Douglas Bates
6+
//
7+
// This file is part of RcppArmadillo.
8+
//
9+
// RcppArmadillo is free software: you can redistribute it and/or modify it
10+
// under the terms of the GNU General Public License as published by
11+
// the Free Software Foundation, either version 2 of the License, or
12+
// (at your option) any later version.
13+
//
14+
// RcppArmadillo is distributed in the hope that it will be useful, but
15+
// WITHOUT ANY WARRANTY; without even the implied warranty of
16+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
// GNU General Public License for more details.
18+
//
19+
// You should have received a copy of the GNU General Public License
20+
// along with RcppArmadillo. If not, see <http://www.gnu.org/licenses/>.
21+
22+
#ifndef RcppArmadillo__RcppArmadillo
23+
#define RcppArmadillo__RcppArmadillo
24+
25+
#if defined(Rcpp_hpp) && !defined(COMPILING_RCPPARMADILLO)
26+
#error "The file 'Rcpp.h' should not be included. Please correct to include only 'RcppArmadillo.h'."
27+
#endif
28+
29+
// We are undoing a design decision from early on by allowing vectors be returned
30+
// as standard 'one-dimension' objects -- as opposed to the matrix form we imposed
31+
#define RCPP_ARMADILLO_RETURN_ANYVEC_AS_VECTOR
32+
33+
// Set up actual #include <armadillo> after first #include <RcppArmadilloConfig> and more config
34+
#include <RcppArmadilloForward.h>
35+
36+
// Automatically include Rcpp as well -- but only the 'lightest' mode sans modules, rtti, sugar
37+
#include <Rcpp/Lightest>
38+
39+
// Remaining RcppArmadillo code
40+
#include <RcppArmadilloWrap.h>
41+
#include <RcppArmadilloAs.h>
42+
#include <RcppArmadilloSugar.h>
43+
44+
#endif

‎inst/include/RcppArmadillo/RcppArmadillo

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// Emacs, please make this -*- mode: C++; -*-
2+
3+
// RcppArmadillo: Rcpp/Armadillo glue
4+
//
5+
// Copyright (C) 2010 - 2022 Dirk Eddelbuettel, Romain Francois and Douglas Bates
6+
//
7+
// This file is part of RcppArmadillo.
8+
//
9+
// RcppArmadillo is free software: you can redistribute it and/or modify it
10+
// under the terms of the GNU General Public License as published by
11+
// the Free Software Foundation, either version 2 of the License, or
12+
// (at your option) any later version.
13+
//
14+
// RcppArmadillo is distributed in the hope that it will be useful, but
15+
// WITHOUT ANY WARRANTY; without even the implied warranty of
16+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
// GNU General Public License for more details.
18+
//
19+
// You should have received a copy of the GNU General Public License
20+
// along with RcppArmadillo. If not, see <http://www.gnu.org/licenses/>.
21+
22+
#ifndef RcppArmadillo__RcppArmadillo
23+
#define RcppArmadillo__RcppArmadillo
24+
25+
#if defined(Rcpp_hpp) && !defined(COMPILING_RCPPARMADILLO)
26+
#error "The file 'Rcpp.h' should not be included. Please correct to include only 'RcppArmadillo.h'."
27+
#endif
28+
29+
// We are undoing a design decision from early on by allowing vectors be returned
30+
// as standard 'one-dimension' objects -- as opposed to the matrix form we imposed
31+
#define RCPP_ARMADILLO_RETURN_ANYVEC_AS_VECTOR
32+
33+
// Set up actual #include <armadillo> after first #include <RcppArmadilloConfig> and more config
34+
#include <RcppArmadilloForward.h>
35+
36+
// Automatically include Rcpp as well -- full version
37+
#include <Rcpp/Rcpp>
38+
39+
// Remaining RcppArmadillo code
40+
#include <RcppArmadilloWrap.h>
41+
#include <RcppArmadilloAs.h>
42+
#include <RcppArmadilloSugar.h>
43+
44+
#endif

‎inst/include/RcppArmadillo_impl/RcppArmadilloConfigGenerated.h.in

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)