Skip to content

Commit 4a8d30f

Browse files
authored
Update format string in test package by updating generated RcppExports file (#1289)
* Regenerated two files to update printf format string * Roll micro version and date
1 parent ecdd22e commit 4a8d30f

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2023-11-28 Dirk Eddelbuettel <[email protected]>
2+
3+
* inst/tinytest/testRcppInterfaceExporter/R/RcppExports.R: Regenerated
4+
* inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp: Idem
5+
16
2023-11-26 Dirk Eddelbuettel <[email protected]>
27

38
* DESCRIPTION (Version, Date): Roll micro version

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: Rcpp
22
Title: Seamless R and C++ Integration
3-
Version: 1.0.11.5
4-
Date: 2023-11-26
3+
Version: 1.0.11.6
4+
Date: 2023-11-28
55
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
66
Nathan Russell, Inaki Ucar, Douglas Bates and John Chambers
77
Maintainer: Dirk Eddelbuettel <[email protected]>

inst/include/Rcpp/config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define RCPP_VERSION_STRING "1.0.11"
3131

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

3636
#endif

inst/tinytest/testRcppInterfaceExporter/R/RcppExports.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ test_cpp_interface <- function(x, fast = FALSE) {
88

99
# Register entry points for exported C++ functions
1010
methods::setLoadAction(function(ns) {
11-
.Call('_testRcppInterfaceExporter_RcppExport_registerCCallable', PACKAGE = 'testRcppInterfaceExporter')
11+
.Call(`_testRcppInterfaceExporter_RcppExport_registerCCallable`)
1212
})

inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88

99
using namespace Rcpp;
1010

11+
#ifdef RCPP_USE_GLOBAL_ROSTREAM
12+
Rcpp::Rostream<true>& Rcpp::Rcout = Rcpp::Rcpp_cout_get();
13+
Rcpp::Rostream<false>& Rcpp::Rcerr = Rcpp::Rcpp_cerr_get();
14+
#endif
15+
1116
// test_cpp_interface
1217
SEXP test_cpp_interface(SEXP x, bool fast);
1318
static SEXP _testRcppInterfaceExporter_test_cpp_interface_try(SEXP xSEXP, SEXP fastSEXP) {
@@ -38,7 +43,7 @@ RcppExport SEXP _testRcppInterfaceExporter_test_cpp_interface(SEXP xSEXP, SEXP f
3843
if (rcpp_isError_gen) {
3944
SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
4045
UNPROTECT(1);
41-
Rf_error(CHAR(rcpp_msgSEXP_gen));
46+
Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
4247
}
4348
UNPROTECT(1);
4449
return rcpp_result_gen;

0 commit comments

Comments
 (0)