Skip to content
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

Update format string in test package by updating generated RcppExports file #1289

Merged
merged 2 commits into from
Nov 28, 2023
Merged

Update format string in test package by updating generated RcppExports file #1289

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
8105d1d
Regenerated two files to update printf format string
eddelbuettel Nov 28, 2023
9895855
Roll micro version and date
eddelbuettel Nov 28, 2023
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
5 changes: 5 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2023-11-28 Dirk Eddelbuettel <edd@debian.org>

* inst/tinytest/testRcppInterfaceExporter/R/RcppExports.R: Regenerated
* inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp: Idem

2023-11-26 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll micro version
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,7 +1,7 @@
Package: Rcpp
Title: Seamless R and C++ Integration
Version: 1.0.11.5
Date: 2023-11-26
Version: 1.0.11.6
Date: 2023-11-28
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
Nathan Russell, Inaki Ucar, Douglas Bates and John Chambers
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Expand Down
4 changes: 2 additions & 2 deletions inst/include/Rcpp/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define RCPP_VERSION_STRING "1.0.11"

// the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it)
#define RCPP_DEV_VERSION RcppDevVersion(1,0,11,5)
#define RCPP_DEV_VERSION_STRING "1.0.11.5"
#define RCPP_DEV_VERSION RcppDevVersion(1,0,11,6)
#define RCPP_DEV_VERSION_STRING "1.0.11.6"

#endif
2 changes: 1 addition & 1 deletion inst/tinytest/testRcppInterfaceExporter/R/RcppExports.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ test_cpp_interface <- function(x, fast = FALSE) {

# Register entry points for exported C++ functions
methods::setLoadAction(function(ns) {
.Call('_testRcppInterfaceExporter_RcppExport_registerCCallable', PACKAGE = 'testRcppInterfaceExporter')
.Call(`_testRcppInterfaceExporter_RcppExport_registerCCallable`)
})
7 changes: 6 additions & 1 deletion inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@

using namespace Rcpp;

#ifdef RCPP_USE_GLOBAL_ROSTREAM
Rcpp::Rostream<true>& Rcpp::Rcout = Rcpp::Rcpp_cout_get();
Rcpp::Rostream<false>& Rcpp::Rcerr = Rcpp::Rcpp_cerr_get();
#endif

// test_cpp_interface
SEXP test_cpp_interface(SEXP x, bool fast);
static SEXP _testRcppInterfaceExporter_test_cpp_interface_try(SEXP xSEXP, SEXP fastSEXP) {
Expand Down Expand Up @@ -38,7 +43,7 @@ RcppExport SEXP _testRcppInterfaceExporter_test_cpp_interface(SEXP xSEXP, SEXP f
if (rcpp_isError_gen) {
SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
UNPROTECT(1);
Rf_error(CHAR(rcpp_msgSEXP_gen));
Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
}
UNPROTECT(1);
return rcpp_result_gen;
Expand Down