Skip to content

added cpp14 #46

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
bhelsel merged 2 commits into from
Jun 1, 2026
Merged

added cpp14 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17db95d
added cpp14
muschellij2 May 20, 2026
fce2f63
Merge branch 'master' into cpp14
bhelsel Jun 1, 2026
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
1 change: 1 addition & 0 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,5 @@ LinkingTo:
RcppArmadillo
URL: https://github.com/bhelsel/agcounts
BugReports: https://github.com/bhelsel/agcounts/issues
SystemRequirements: C++14
Config/roxygen2/version: 8.0.0
1 change: 1 addition & 0 deletions src/Makevars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CXX_STD = CXX14
1 change: 1 addition & 0 deletions src/Makevars.win
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CXX_STD = CXX14
2 changes: 1 addition & 1 deletion src/gcalibrate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// [[Rcpp::plugins(cpp11)]]
// [[Rcpp::plugins(cpp14)]]
#include <RcppArmadillo.h>
#include <iostream>
#include <vector>
Expand Down
3 changes: 1 addition & 2 deletions src/resample_helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// [[Rcpp::plugins(cpp11)]]
// [[Rcpp::plugins(cpp14)]]
#include <Rcpp.h>
using namespace Rcpp;

Expand All @@ -25,4 +25,3 @@ NumericMatrix upsampleC(NumericMatrix X, double b_fp) {
}
return out;
}

Loading