Skip to content

Commit de69866

Browse files
(possibly fatal) check for Rcpp and RcppArmadillo now opt-in (closes #19) (#21)
* (possibly fatal) check for Rcpp and RcppArmadillo now opt-in * Remove the header check Co-authored-by: James J Balamuta <[email protected]>
1 parent 75b7207 commit de69866

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1+
2019-01-14 James Balamuta <[email protected]>
2+
3+
* inst/include/RcppEnsmallen.h: Removed header ordering checks
4+
15
2019-01-13 James Balamuta <[email protected]>
26

37
* .github/workflows/pr-commands.yaml: Removed as its overly eager.
48

9+
2020-01-11 Dirk Eddelbuettel <[email protected]>
10+
11+
* inst/include/RcppEnsmallen.h: Protected header inclusion check
12+
513
2019-12-30 James Balamuta <[email protected]>
614

715
* DESCRIPTION (Version): Release 2.11.1

inst/include/RcppEnsmallen.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
#ifndef RcppEnsmallen__RcppEnsmallen__h
1919
#define RcppEnsmallen__RcppEnsmallen__h
2020

21-
#if defined(Rcpp_hpp) && defined(RcppArmadillo__RcppArmadillo__h)
22-
#error "Do not include either 'Rcpp.h' or 'RcppArmadillo.h'. Please only use 'RcppEnsmallen.h'."
23-
#endif
24-
2521
// Enable RcppArmadillo and Rcpp
2622
#include <RcppArmadillo.h>
2723

0 commit comments

Comments
 (0)