diff -Nru rcpp-1.0.11/ChangeLog rcpp-1.0.12/ChangeLog --- rcpp-1.0.11/ChangeLog 2023-07-03 14:53:14.000000000 +0000 +++ rcpp-1.0.12/ChangeLog 2024-01-04 14:32:09.000000000 +0000 @@ -1,3 +1,102 @@ +2024-01-08 Dirk Eddelbuettel + + * DESCRIPTION (Date, Version): Release 1.0.12 + + * inst/include/Rcpp/config.h: Idem + * inst/NEWS.Rd: Idem + * vignettes/rmd/Rcpp.bib: Idem + * inst/bib/Rcpp.bib: Idem + * vignettes/pdf/*: Rebuilt + +2024-01-01 Dirk Eddelbuettel + + * vignettes/rmd/Rcpp.bib: Updated to current versions of cited packages + * inst/bib/Rcpp.bib: Idem + +2023-12-27 Dirk Eddelbuettel + + * src/api.cpp (type2name): Refine OBJSXP return + +2023-12-21 Dirk Eddelbuettel + + * src/api.cpp (type2name): Recognise OBJSXP added in R 4.4.0 + +2023-11-28 Dirk Eddelbuettel + + * inst/tinytest/testRcppInterfaceExporter/R/RcppExports.R: Regenerated + * inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp: Idem + +2023-11-26 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version + * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem + + * src/attributes.cpp (generateCpp): Add a format string for Rf_error + call to not run afoul of -Wformat-security + +2023-11-24 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version + * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem + + * inst/include/Rcpp/iostream/Rstreambuf.h: Cast streamsize to int in + two spots + * inst/include/Rcpp/print.h (warningcall): Add missing '%s' format + +2023-11-11 Dirk Eddelbuettel + + * vignettes/rmd/Rcpp-FAQ.Rmd: Updated and edited + * vignettes/pdf/Rcpp-FAQ.pdf: Updated + * vignettes/rmd/Rcpp.bib: Updated + +2023-10-28 Dirk Eddelbuettel + + * vignettes/rmd/Rcpp-FAQ.Rmd: Updated and edited + * vignettes/pdf/Rcpp-FAQ.pdf: Updated + * vignettes/rmd/Rcpp.bib: Updated + +2023-10-27 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version + * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem + + * R/tools.R: Correct missing Rd macros (spotted by R-devel CMD check) + +2023-10-22 Aaron Lun + + * inst/include/Rcpp/vector/MatrixColumn.h: Cast integer index + to R_xlen_t to avoid integer overflow with large matrices. + * inst/include/Rcpp/vector/MatrixRow.h: Ditto. + * inst/include/Rcpp/vector/Vector.h: Remove stray cast to int + that causes overflow when returning the end iterator. + +2023-09-30 Dirk Eddelbuettel + + * vignettes/rmd/Rcpp-introduction.Rmd (Rcpp): Correct caption of + third figure (cf GitHub issue #1276) + * vignettes/pdf/Rcpp-introduction.pdf: Rebuilt + +2023-08-31 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version + * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem + +2023-08-29 Iñaki Ucar + + * R/Attributes.R: Ad-hoc fix for testthat's C entrypoint in + RcppExports.cpp + +2023-08-03 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version + * inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem + +2023-08-03 Michael Chirico + + * src/attributes.cpp: Directly `#include ` for `std::endl` + * src/date.cpp: Directly `#include ` for `TRUE` and + `FALSE` + 2023-07-03 Dirk Eddelbuettel * DESCRIPTION (Date, Version): Release 1.0.11 diff -Nru rcpp-1.0.11/DESCRIPTION rcpp-1.0.12/DESCRIPTION --- rcpp-1.0.11/DESCRIPTION 2023-07-06 07:33:14.000000000 +0000 +++ rcpp-1.0.12/DESCRIPTION 2024-01-09 08:20:35.000000000 +0000 @@ -1,7 +1,7 @@ Package: Rcpp Title: Seamless R and C++ Integration -Version: 1.0.11 -Date: 2023-07-03 +Version: 1.0.12 +Date: 2024-01-08 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou, Nathan Russell, Inaki Ucar, Douglas Bates and John Chambers Maintainer: Dirk Eddelbuettel @@ -25,6 +25,6 @@ RoxygenNote: 6.1.1 Encoding: UTF-8 NeedsCompilation: yes -Packaged: 2023-07-03 15:56:55 UTC; edd +Packaged: 2024-01-08 12:50:16 UTC; edd Repository: CRAN -Date/Publication: 2023-07-06 07:33:14 UTC +Date/Publication: 2024-01-09 08:20:35 UTC diff -Nru rcpp-1.0.11/MD5 rcpp-1.0.12/MD5 --- rcpp-1.0.11/MD5 2023-07-06 07:33:14.000000000 +0000 +++ rcpp-1.0.12/MD5 2024-01-09 08:20:36.000000000 +0000 @@ -1,11 +1,11 @@ -7e325cf2ffd92ae52b58fffef55fc2ae *ChangeLog -608748ec629231ed434b9ba0e45c234a *DESCRIPTION +8c0f5e51f72eb198625d915564cf8c55 *ChangeLog +92ce15f0e051fc449df4d77cb7b57ff9 *DESCRIPTION f53ecd48407d7485920c4f3caaf187e0 *NAMESPACE ad57518c2d1d3d66fc26b6c214ed13e1 *R/00_classes.R f9a4ffb4d0fcec3eec6ef6c229ff1bba *R/01_show.R 5ad59a1671fd934a15f614a96331c56a *R/02_completion.R 3eafac927ff4e744b84675639ff48078 *R/03_prompt.R -31454c6de5194dc25ade90b159905020 *R/Attributes.R +bab9f9c755bbfc696075080b0cb0cfb1 *R/Attributes.R 92c604e80679db2563fed5acc0b7cc37 *R/Module.R 716cc706c20bc6191155a4890b63ab05 *R/Rcpp.package.skeleton.R ac2a0d66a4892308a3a23eaedc726f84 *R/RcppClass.R @@ -18,43 +18,43 @@ c1f6e22d805062693ca441a313a798c7 *R/loadModule.R 410e549661c436dd77eba6814eb0f5d4 *R/loadRcppModules.R 02c1cb554af89184c6c5c46e1ee49e17 *R/populate.R -a7677d0b8631d443c4ad44014780439b *R/tools.R +66c49e653c7fcbcefb611cc8aef5e61c *R/tools.R e82268e95d8f2d3a1759620eb1bc6664 *R/zzz.R 50c5dff2c92736f29ab1295a450ec32e *README.md dcfe968628d24168fc5bb54a66631158 *TODO -7080893e02c49cd296d4424b9be55069 *build/partial.rdb -ef430c63245f66fc84edb9fe7076b470 *build/vignette.rds +8faf250d78a120ba4c7ea2186efddd24 *build/partial.rdb +966be854cd75cb7bb1c26756b9a42ced *build/vignette.rds c1fc6087257d5e64ae088036c4d5a060 *cleanup 7599bada89d38a2474389682f552755e *inst/CITATION -c3f564107c86a22d28ce090dc202acf2 *inst/NEWS.Rd +8e1402aad7ff816938bd0d02b6faabc0 *inst/NEWS.Rd 7a9967333ad85931cc6d2051f4dff76e *inst/announce/ANNOUNCE-0.10.0.txt 734d037a2ac31af4659fb3b2e1a778ad *inst/announce/ANNOUNCE-0.11.0.txt 7d85af8d096e473821a3f001d3128b01 *inst/announce/ANNOUNCE-0.6.0.txt f61c7e9e1460eac25702b24c1af30442 *inst/announce/ANNOUNCE-0.7.0.txt a198e05a9b004dfc1f8ea67629f2f6c7 *inst/announce/ANNOUNCE-0.8.0.txt 3e8a171f22548f5da208b58e66b48e6c *inst/announce/ANNOUNCE-0.9.0.txt -7991a6dde5e46efc430f3c20ba11d703 *inst/bib/Rcpp.bib +53ec9a5ec3ee37812d493165ff6dca32 *inst/bib/Rcpp.bib 6f1e3b1f4f75e04af65bb9daf94e9630 *inst/discovery/cxx0x.R 2baf167ce452976b0fcb43e44f566af7 *inst/doc/Rcpp-FAQ.Rnw -158d7897cb7443b5036c0944b5f18439 *inst/doc/Rcpp-FAQ.pdf +21aaaa12ac1acc27c7609da7ddb19f60 *inst/doc/Rcpp-FAQ.pdf 887250b7e0675b4a70d6eb1a4689080c *inst/doc/Rcpp-attributes.Rnw -8ec02141fbba1d7ab84e0ccfdbfa980a *inst/doc/Rcpp-attributes.pdf +a4072741280b635504a207a0defdb1e2 *inst/doc/Rcpp-attributes.pdf 37f50a136d1350e8e864c9265cc88ad8 *inst/doc/Rcpp-extending.Rnw -f20ca29b5869e884dae493c0b13ca357 *inst/doc/Rcpp-extending.pdf +bb334269b15c804801152012a09005da *inst/doc/Rcpp-extending.pdf 90eade7bfffa82f250510759bc9a7f36 *inst/doc/Rcpp-introduction.Rnw -a38d4b15e31bb9d487e9be4a272c4f46 *inst/doc/Rcpp-introduction.pdf +8afebfcbd6e9874f9c7ccdedcd11a726 *inst/doc/Rcpp-introduction.pdf e6cf1d12ce4e3a2fed6eddf6290d393f *inst/doc/Rcpp-jss-2011.Rnw -755fca6dd6d3b60021c51341d9164850 *inst/doc/Rcpp-jss-2011.pdf +5d506547ecf067b3c41f5b52251c0412 *inst/doc/Rcpp-jss-2011.pdf 4524c2761e07e170f681181c2e62eb05 *inst/doc/Rcpp-libraries.Rnw -824c48ec3b0b92a3f27503d510036f60 *inst/doc/Rcpp-libraries.pdf +9eef0e2415d3a7c5914c6f222fa93e42 *inst/doc/Rcpp-libraries.pdf a96bcf4153b795bff19ddc36a17ca435 *inst/doc/Rcpp-modules.Rnw -68982da66e5e73beaf0c11fe981b1675 *inst/doc/Rcpp-modules.pdf +8c5d19785fa10f6637120ead78aef2f9 *inst/doc/Rcpp-modules.pdf 835d0e2dd365e4621663bd03ae219758 *inst/doc/Rcpp-package.Rnw -78374ca8496b6ead303550dd494e1959 *inst/doc/Rcpp-package.pdf +27a95aa5af9cf49be6943bfd50327c19 *inst/doc/Rcpp-package.pdf d76adfdc4e68c69c5ff632e234db6a85 *inst/doc/Rcpp-quickref.Rnw -f5c60b7ea509e568fd8b982ed0c3d8b8 *inst/doc/Rcpp-quickref.pdf +42ba34b2bd94c8978fd2f5f23d256ec6 *inst/doc/Rcpp-quickref.pdf 929a1aad762b7354b6875a35093ec477 *inst/doc/Rcpp-sugar.Rnw -2399444a5091e3b17aacf73078e92cb1 *inst/doc/Rcpp-sugar.pdf +0dc20021bc05944fac37cddce9d91660 *inst/doc/Rcpp-sugar.pdf 35fa971232b8c9fb0bbb9dfc2ad3de7a *inst/examples/Attributes/Depends.cpp a9aa3aceea0b49525155a2c43296318b *inst/examples/Attributes/Export.cpp c6c9969e0067a1321827369cba1cc566 *inst/examples/Attributes/cppFunction.R @@ -178,7 +178,7 @@ 90c153091bc3fb1e123fef9dc40394e6 *inst/include/Rcpp/barrier.h fa7b26bbe19f908b9c00ead2fe2717ac *inst/include/Rcpp/clone.h 1b3b2bee1fc9bd3f231c2a33ca572281 *inst/include/Rcpp/complex.h -b1054111014416f65e189b449847bf5b *inst/include/Rcpp/config.h +43ec88fa1d57c15a720dca0a7c7b0b93 *inst/include/Rcpp/config.h b90e19134c5d4a4c0652f956c022d1e4 *inst/include/Rcpp/date_datetime/Date.h e75130fc77dac6243e5c88639c940dea *inst/include/Rcpp/date_datetime/Datetime.h 0d754f1a9266c3e1bbc6946ba1304ab5 *inst/include/Rcpp/date_datetime/date_datetime.h @@ -218,7 +218,7 @@ 440c2f839bd5756d630f66f41ee7c9a7 *inst/include/Rcpp/internal/r_vector.h be267828e3e200668df1d37c3b90edd0 *inst/include/Rcpp/internal/wrap.h 14b302e7f5cca681f122cccde5418cbd *inst/include/Rcpp/internal/wrap_end.h -e32f85c09b96c4c250a58d2961f92896 *inst/include/Rcpp/iostream/Rstreambuf.h +1914c43f5b9f93808062adf5e2c0a005 *inst/include/Rcpp/iostream/Rstreambuf.h c852659f0876b4dd0a3d3d99e972d1cb *inst/include/Rcpp/is.h 24e8a8c1f4a580954091edb9dae2cfd9 *inst/include/Rcpp/lang.h d93f0f5c828018c1ae632ce1fb929293 *inst/include/Rcpp/longlong.h @@ -255,7 +255,7 @@ 99322cf8421a1cc8964659b05d79a906 *inst/include/Rcpp/module/get_return_type.h 52cb1005938ee160ac29547e92d18584 *inst/include/Rcpp/platform/compiler.h 8f9d3b2218818dfe5f703e6900d603e9 *inst/include/Rcpp/platform/solaris.h -31dca740cef939bf19499eeb1a50a3ea *inst/include/Rcpp/print.h +e6f882c26076e813fe8290c46b1c0fd8 *inst/include/Rcpp/print.h abd6c01295a88b73432a77f6a79aca3a *inst/include/Rcpp/protection/Armor.h fa63d47f044e1012a5431319108f01f9 *inst/include/Rcpp/protection/Shelter.h 6357a773233c2c9f5415c6445fe103f9 *inst/include/Rcpp/protection/Shield.h @@ -475,12 +475,12 @@ 020c11693ef729783f6ce9c70e0b3a86 *inst/include/Rcpp/vector/ListOf.h bd73507d75d9178924fc00b70b1f6f55 *inst/include/Rcpp/vector/Matrix.h a6c5cdec475185adc2b61152bc9379de *inst/include/Rcpp/vector/MatrixBase.h -3a7e583f12436fd76a2329bbdc604507 *inst/include/Rcpp/vector/MatrixColumn.h -2001eb2ae77a9601cb236e760b20ff4c *inst/include/Rcpp/vector/MatrixRow.h +fea18a15ac16177399b74b3aba1e8d3c *inst/include/Rcpp/vector/MatrixColumn.h +410f8a433cea0b58017e10edcdd520d7 *inst/include/Rcpp/vector/MatrixRow.h dabec153dcf826b040e592e1c60fc37f *inst/include/Rcpp/vector/RangeIndexer.h c71d7fdd2ecbadeff8068998d3501c5c *inst/include/Rcpp/vector/SubMatrix.h d82ab8c34035edc7ac37af4d619406cc *inst/include/Rcpp/vector/Subsetter.h -25b4cdae0a3c88788551fac10d73c797 *inst/include/Rcpp/vector/Vector.h +60ce240930e82616ed29237630cfd7b4 *inst/include/Rcpp/vector/Vector.h 99dc1e7a939e6f11ec33588c382517cd *inst/include/Rcpp/vector/VectorBase.h 0c3ff20020b3ff5248826ff796752946 *inst/include/Rcpp/vector/const_generic_proxy.h c76a4bfbaf1c61171799f258f6393ea4 *inst/include/Rcpp/vector/const_string_proxy.h @@ -574,11 +574,11 @@ f369e8eabd84792764737850dc9cf599 *inst/tinytest/testRcppClass/tests/classes.R 55a2cc182d8bdab7df8367bb2c9ae4f1 *inst/tinytest/testRcppInterfaceExporter/DESCRIPTION caccac1441b38bc3b9d91f9e189b1d68 *inst/tinytest/testRcppInterfaceExporter/NAMESPACE -cf3fc9dfc4a7d7e88dd0bcc32220fee3 *inst/tinytest/testRcppInterfaceExporter/R/RcppExports.R +052892f806ecd5542358fd7ae3bb58d9 *inst/tinytest/testRcppInterfaceExporter/R/RcppExports.R f9c87d177bece784bca40b2294329568 *inst/tinytest/testRcppInterfaceExporter/R/exporter.R cdb9489e21b94623f0f1e7d4af8ec157 *inst/tinytest/testRcppInterfaceExporter/inst/include/testRcppInterfaceExporter.h 1cbd306e27aed3fcb7b5fbc34d42b39d *inst/tinytest/testRcppInterfaceExporter/inst/include/testRcppInterfaceExporter_RcppExports.h -5f0d00b4fa5ddc900e41058abf3f92ef *inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp +ae4a8309d7807432ae8e1b507132acb3 *inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp 0805a3830147dedf4a37a91f9ad66a4d *inst/tinytest/testRcppInterfaceExporter/src/exporter.cpp 53dfff77ccb443103f44fb52eea3187b *inst/tinytest/testRcppInterfaceExporter/src/unwound.h d4ceb27b690d25e3bf791340e1082ede *inst/tinytest/testRcppInterfaceUser/DESCRIPTION @@ -682,7 +682,7 @@ bef1d268eb1652a7cc3b15d5f691b6e8 *man/exportAttribute.Rd 01cbef50e7820a40e65d410ab4ce6d2e *man/exposeClass.Rd 236811309af8821f7e23dfc16f9a8d41 *man/formals.Rd -3247f7c014454d608bcfa53b6b123b68 *man/getRcppVersion.Rd +ee26bc930a1bff02c8664c0e51bd46da *man/getRcppVersion.Rd 708280bfbc3f6dc6d8cf76fe2a2afd0a *man/interfacesAttribute.Rd 25e1ffdc750d2f2778b38919c098c9cc *man/loadModule.Rd 92c309f1d37426d2e2b4737f99bd75af *man/loadRcppModules-deprecated.Rd @@ -693,10 +693,10 @@ 53e0cd847f1775e36539946d8112cf69 *man/sourceCpp.Rd 73e9e048a7c5003477f67089bf5d609c *src/Makevars 73e9e048a7c5003477f67089bf5d609c *src/Makevars.win -362f19d44ad852e2913f553ce10226ca *src/api.cpp -64d1b17ddf4f21f97f3e8033abe6dc72 *src/attributes.cpp +7773fd51d0b0ef2f5cd4c2cd619dbf12 *src/api.cpp +90d6be74df239c57e83a076c5f27e1cc *src/attributes.cpp 883f8c7d312fa9add305c4d3d7884cd9 *src/barrier.cpp -a1e0b1d968670ded89f33218d2bf2a62 *src/date.cpp +85a8a53c535e4c986f02c427b5e7b85e *src/date.cpp eef4c2f0e1abd787b8fd62d289ed5961 *src/internal.h 4eeaedc1e555103025f1feeaee299538 *src/module.cpp 545982e58b067742919490cc23d62905 *src/rcpp_init.cpp @@ -711,10 +711,10 @@ 835d0e2dd365e4621663bd03ae219758 *vignettes/Rcpp-package.Rnw d76adfdc4e68c69c5ff632e234db6a85 *vignettes/Rcpp-quickref.Rnw 929a1aad762b7354b6875a35093ec477 *vignettes/Rcpp-sugar.Rnw -e6551da96360a1fa289b8c705990d3eb *vignettes/pdf/Rcpp-FAQ.pdf +5818122809a51083836215d964f4463e *vignettes/pdf/Rcpp-FAQ.pdf c98b0e8f6536e421e119454f6da61b32 *vignettes/pdf/Rcpp-attributes.pdf 8b883e22bd0cff3e5978437e7bb5697e *vignettes/pdf/Rcpp-extending.pdf -13286ad3d8846a29bf1d65a0f708b52f *vignettes/pdf/Rcpp-introduction.pdf +a5a8284bd31bfc04e546d646efe8d15d *vignettes/pdf/Rcpp-introduction.pdf 4e83be5a82fcb0ca31ec13f89f41130a *vignettes/pdf/Rcpp-jss-2011.pdf 369b5a2859456f2422c85fba31dd801d *vignettes/pdf/Rcpp-libraries.pdf 2afc38f470fdfe56e5c4e3523cfa374d *vignettes/pdf/Rcpp-modules.pdf diff -Nru rcpp-1.0.11/R/Attributes.R rcpp-1.0.12/R/Attributes.R --- rcpp-1.0.11/R/Attributes.R 2023-03-27 11:56:07.000000000 +0000 +++ rcpp-1.0.12/R/Attributes.R 2023-08-31 13:16:31.000000000 +0000 @@ -1260,6 +1260,10 @@ if (!routine %in% routines) { declaration <- grep(sprintf("^extern .* %s\\(.*$", routine), code, value = TRUE) + # FIXME: maybe we should extend this to *any* routine? + # or is there any case in which `void *` is not SEXP for a .Call? + if (routine == "run_testthat_tests") + declaration <- gsub("void *", "SEXP", declaration, fixed=TRUE) declarations <- c(declarations, sub("^extern", "RcppExport", declaration)) call_entries <- c(call_entries, match[[1]]) # #nocov end } diff -Nru rcpp-1.0.11/R/tools.R rcpp-1.0.12/R/tools.R --- rcpp-1.0.11/R/tools.R 2023-03-26 18:40:38.000000000 +0000 +++ rcpp-1.0.12/R/tools.R 2023-11-12 01:43:20.000000000 +0000 @@ -53,7 +53,7 @@ ##' Helper function to report the package version of the R installation. ##' ##' While \code{packageVersion(Rcpp)} exports the version registers in -##' {DESCRIPTION}, this version does get incremented more easily +##' \code{DESCRIPTION}, this version does get incremented more easily ##' during development and can therefore be higher than the released ##' version. The actual \code{#define} long used at the C++ level ##' corresponds more to an \sQuote{API Version} which is now provided Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/build/partial.rdb and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/build/partial.rdb differ Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/build/vignette.rds and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/build/vignette.rds differ diff -Nru rcpp-1.0.11/debian/changelog rcpp-1.0.12/debian/changelog --- rcpp-1.0.11/debian/changelog 2023-07-06 11:55:30.000000000 +0000 +++ rcpp-1.0.12/debian/changelog 2024-01-09 12:36:19.000000000 +0000 @@ -1,3 +1,12 @@ +rcpp (1.0.12-1) unstable; urgency=medium + + * New upstream release + + * debian/control: Set Build-Depends: to current R version + * debian/control: Switch to virtual debhelper-compat (= 13) + + -- Dirk Eddelbuettel Tue, 09 Jan 2024 06:36:19 -0600 + rcpp (1.0.11-1) unstable; urgency=medium * New upstream release diff -Nru rcpp-1.0.11/debian/control rcpp-1.0.12/debian/control --- rcpp-1.0.11/debian/control 2023-07-06 11:55:17.000000000 +0000 +++ rcpp-1.0.12/debian/control 2024-01-09 12:36:19.000000000 +0000 @@ -2,7 +2,7 @@ Section: gnu-r Priority: optional Maintainer: Dirk Eddelbuettel -Build-Depends: debhelper-compat (= 12), r-base-dev (>= 4.3.1), dh-r, r-cran-codetools, r-cran-pkgkitten +Build-Depends: debhelper-compat (= 13), r-base-dev (>= 4.3.2), dh-r, r-cran-codetools, r-cran-pkgkitten Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/edd/r-cran-rcpp Vcs-Git: https://salsa.debian.org/edd/r-cran-rcpp.git diff -Nru rcpp-1.0.11/inst/NEWS.Rd rcpp-1.0.12/inst/NEWS.Rd --- rcpp-1.0.11/inst/NEWS.Rd 2023-07-03 15:30:21.000000000 +0000 +++ rcpp-1.0.12/inst/NEWS.Rd 2024-01-04 14:32:59.000000000 +0000 @@ -3,7 +3,46 @@ \newcommand{\ghpr}{\href{https://github.com/RcppCore/Rcpp/pull/#1}{##1}} \newcommand{\ghit}{\href{https://github.com/RcppCore/Rcpp/issues/#1}{##1}} -\section{Changes in Rcpp rc version 1.0.11 (2023-07-03)}{ +\section{Changes in Rcpp release version 1.0.12 (2024-01-08)}{ + \itemize{ + \item Changes in Rcpp API: + \itemize{ + \item Missing header includes as spotted by some recent tools were + added in two places (Michael Chirico in \ghpr{1272} closing + \ghit{1271}). + \item Casts to avoid integer overflow in matrix row/col selections + have neem added (Aaron Lun \ghpr{1281}). + \item Three print format correction uncovered by R-devel were + applied with thanks to Tomas Kalibera (Dirk in \ghpr{1285}). + \item Correct a print format correction in the RcppExports glue code + (Dirk in \ghpr{1288} fixing \ghit{1287}). + \item The upcoming \code{OBJSXP} addition to R 4.4.0 is supported in + the \code{type2name} mapper (Dirk and Iñaki in \ghpr{1293}). + } + \item Changes in Rcpp Attributes: + \itemize{ + \item Generated interface code from base R that fails under LTO is now + corrected (Iñaki in \ghpr{1274} fixing a StackOverflow issue). + } + \item Changes in Rcpp Documentation: + \itemize{ + \item The caption for third figure in the introductory vignette has + been corrected (Dirk in \ghpr{1277} fixing \ghit{1276}). + \item A small formatting issue was correct in an Rd file as + noticed by R-devel (Dirk in \ghpr{1282}). + \item The Rcpp FAQ vignette has been updated (Dirk in \ghpr{1284}). + \item The \code{Rcpp.bib} file has been refreshed to current package + versions. + } + \item Changes in Rcpp Deployment: + \itemize{ + \item The RcppExports file for an included test package has been + updated (Dirk in \ghpr{1289}). + } + } +} + +\section{Changes in Rcpp release version 1.0.11 (2023-07-03)}{ \itemize{ \item Changes in Rcpp API: \itemize{ @@ -11,10 +50,10 @@ on linux (Lukasz in \ghpr{1243} closing \ghit{1242}). \item Two unit tests no longer accidentally bark on stdout (Dirk and Iñaki in \ghpr{1245}). - \item Compilation under C++ using \pkg{clang++} and its standard + \item Compilation under C++20 using \pkg{clang++} and its standard library is enabled (Dirk in \ghpr{1248} closing \ghit{1244}). \item Use backticks in a generated \code{.Call()} statement in - `RcppExports.R` (Dirk \ghpr{1256} closing \ghit{1255}). + \code{RcppExports.R} (Dirk \ghpr{1256} closing \ghit{1255}). \item Switch to \code{system2()} to capture standard error messages in error cases (Iñaki in \ghpr{1259} and \ghpr{1261} fixing \ghit{1257}). } diff -Nru rcpp-1.0.11/inst/bib/Rcpp.bib rcpp-1.0.12/inst/bib/Rcpp.bib --- rcpp-1.0.11/inst/bib/Rcpp.bib 2023-07-03 15:44:10.000000000 +0000 +++ rcpp-1.0.12/inst/bib/Rcpp.bib 2024-01-04 14:33:16.000000000 +0000 @@ -75,7 +75,7 @@ @Manual{CRAN:anytime, title = {anytime: Anything to 'POSIXct' or 'Date' Converter}, author = {Dirk Eddelbuettel}, - year = {2021}, + year = {2020}, note = {R package version 0.3.9}, url = CRAN # "package=anytime" } @@ -84,16 +84,16 @@ title = {BH: Boost C++ Header Files}, author = {Dirk Eddelbuettel and John W. Emerson and Michael J. Kane}, - year = {2021}, - note = {R package version 1.78.0-0}, + year = {2023}, + note = {R package version 1.81.0-1}, url = CRAN # "package=BH" } @Manual{CRAN:Matrix, title = {\pkg{Matrix}: Sparse and Dense Matrix Classes and Methods}, author = {Douglas Bates and Martin Maechler}, - year = 2021, - note = {R package version 1.4-0}, + year = 2023, + note = {R package version 1.6-4}, url = CRAN # "package=Matrix" } @@ -108,16 +108,16 @@ @Manual{CRAN:RProtoBuf, title = {RProtoBuf: R Interface to the Protocol Buffers API}, author = {Romain Fran\c{c}ois and Dirk Eddelbuettel and Murray Stokely and Jeroen Ooms}, - year = 2021, - note = {R package version 0.4.18}, + year = 2023, + note = {R package version 0.4.21}, url = CRAN # "package=RProtoBuf" } @Manual{CRAN:RQuantLib, title = {RQuantLib: {R} interface to the {QuantLib} library}, author = {Dirk Eddelbuettel and Khanh Nguyen and Terry Leitch}, - year = 2021, - note = {R package version 0.4.14}, + year = 2023, + note = {R package version 0.4.20}, url = CRAN # "package=RQuantLib" } @@ -135,8 +135,8 @@ author = {Dirk Eddelbuettel and Romain Fran\c{c}ois and JJ Allaire and Kevin Ushey and Qiang Kou and Nathan Russel and John Chambers and Douglas Bates}, - year = 2023, - note = {R package version 1.0.11}, + year = 2024, + note = {R package version 1.0.12}, url = CRAN # "package=Rcpp" } @@ -154,11 +154,20 @@ crossref = {CRAN:Rcpp}, author = {Dirk Eddelbuettel and Romain Fran\c{c}ois}, title = {Frequently Asked Questions About {Rcpp}}, - year = 2022, + year = 2023, note = {Vignette included in R package {Rcpp}}, url = CRAN # "package=Rcpp" } +@Manual{CRAN:Rcpp:Libraries, + crossref = {CRAN:Rcpp}, + author = {Dirk Eddelbuettel}, + title = {Thirteen Simple Steps for Creating An R Package with an External C++ Library }, + year = 2023, + note = {Vignette included in R package Rcpp}, + url = CRAN # "package=Rcpp" +} + @Manual{CRAN:Rcpp:Modules, crossref = {CRAN:Rcpp}, author = {Dirk Eddelbuettel and Romain Fran\c{c}ois}, @@ -192,23 +201,23 @@ author = {Dirk Eddelbuettel and Romain Fran\c{c}ois and Douglas Bates and Binxiang Ni and Conrad Sanderson}, year = 2023, - note = {R package version 0.12.4.1.0}, + note = {R package version 0.12.6.6.1}, url = CRAN # "package=RcppArmadillo" } @Manual{CRAN:RcppCCTZ, title = {RcppCCTZ: Rcpp Bindings for the CCTZ Library}, author = {Dirk Eddelbuettel}, - year = 2021, - note = {R package version 0.2.10}, + year = 2022, + note = {R package version 0.2.12}, url = CRAN # "package=RcppCCTZ" } @Manual{CRAN:RcppClassic, title = {RcppClassic: Deprecated 'classic' Rcpp API}, author = {Dirk Eddelbuettel and Romain Fran\c{c}ois}, - year = 2019, - note = {R package version 0.9.12}, + year = 2022, + note = {R package version 0.9.13}, url = CRAN # "package=RcppClassic" } @@ -223,8 +232,8 @@ @Manual{CRAN:RcppDE, title = {RcppDE: Global optimization by differential evolution in C++}, author = {Dirk Eddelbuettel}, - year = 2018, - note = {R package version 0.1.6}, + year = 2022, + note = {R package version 0.1.7}, url = CRAN # "package=RcppDE" } @@ -232,8 +241,8 @@ title = {RcppEigen: Rcpp integration for the Eigen templated linear algebra library}, author = {Douglas Bates and Dirk Eddelbuettel and Romain Fran\c{c}ois and Yixuan Qiu}, - year = 2020, - note = {{R} package version 0.3.3.9.1}, + year = 2023, + note = {{R} package version 0.3.3.9.4}, url = CRAN # "package=RcppEigen" } @@ -254,6 +263,14 @@ url = CRAN # "package=RcppGSL" } +@Manual{CRAN:RcppInt64, + title = {RppInt64: Rcpp-Based Helper Functions to Pass Int64 and nanotime Values Between R and C++}, + author = {Dirk Eddelbuettel}, + year = 2023, + note = {R package version 0.0.4}, + url = CRAN # "package=RcppInt64" +} + @Manual{CRAN:RcppZiggurat, title = {RcppZiggurat: Rcpp Integration of Different Ziggurat Normal RNG Implementations}, author = {Dirk Eddelbuettel}, @@ -265,8 +282,8 @@ @Manual{CRAN:Rserve, title = {Rserve: Binary R server}, author = {Simon Urbanek}, - year = 2021, - note = {R package version 1.8-10}, + year = 2023, + note = {R package version 1.8-13}, url = CRAN # "package=Rserve" } @@ -283,16 +300,16 @@ title = {devtools: Tools to Make Developing R Packages Easier}, author = {Hadley Wickham and Jim Hester and Winston Chang}, - year = 2021, - note = {R package version 2.4.3}, + year = 2022, + note = {R package version 2.4.5}, url = CRAN # "package=devtools" } @Manual{CRAN:highlight, title = {highlight: Syntax highlighter}, author = {Hadley Wickham and Romain Fran\c{c}ois and Andre Simon}, - year = 2019, - note = {R package with version 0.5.0}, + year = 2023, + note = {R package with version 0.5.1}, url = CRAN # "package=highlight" } @@ -310,16 +327,16 @@ @Manual{CRAN:littler, title = {littler: {R} at the {Command-Line} via r}, author = {Dirk Eddelbuettel and Jeffrey Horner}, - year = 2021, - note = {R package version 0.3.15}, + year = 2023, + note = {R package version 0.3.19}, url = CRAN # "package=littler" } @Manual{CRAN:microbenchmark, title = {microbenchmark: Accurate Timing Functions}, author = {Olaf Mersmann}, - year = 2021, - note = {R package version 1.4-9}, + year = 2023, + note = {R package version 1.4-10}, url = CRAN # "package=microbenchmark" } @@ -328,8 +345,8 @@ quadratic approximation}, author = {Douglas Bates and Katharine M. Mullen and John C. Nash and Ravi Varadhan}, - year = 2014, - note = {R package version 1.2.4}, + year = 2023, + note = {R package version 1.2.6}, url = CRAN # "package=minqa" } @@ -337,16 +354,16 @@ title = {pkgKitten: Create Simple Packages Which Do not Upset R Package Checks}, author = {Dirk Eddelbuettel}, - year = {2021}, - note = {R package version 0.2.2}, + year = {2023}, + note = {R package version 0.2.3}, url = CRAN # "package=pkgKitten" } @Manual{CRAN:profvis, title = {profvis: Interactive Visualizations for Profiling R Code}, author = {Winston Chang and Javier Luraschi and and Timothy Mastny}, - year = 2020, - note = {R package version 0.3.7}, + year = 2023, + note = {R package version 0.3.8}, url = CRAN # "package=profvis" } @@ -361,8 +378,8 @@ @Manual{CRAN:roxygen2, title = {roxygen2: In-source documentation for R}, author = {Hadley Wickham and Peter Danenberg and G\a'bor Cs\a'rdi and Manuel Eugster}, - year = 2021, - note = {R package version 7.1.2}, + year = 2022, + note = {R package version 7.2.3}, url = CRAN # "package=roxygen2" } @@ -734,7 +751,7 @@ author = RCoreTeam, organization = RFoundation, address = {Vienna, Austria}, - year = 2018, + year = 2023, title = "R Installation and Administration", annote = {{ISBN} 3-900051-09-7}, url = manuals # "R-admin.html" @@ -744,7 +761,7 @@ author = RCoreTeam, organization = RFoundation, address = {Vienna, Austria}, - year = 2021, + year = 2023, title = "Writing R extensions", annote = {{ISBN} 3-900051-11-9}, url = manuals # "R-exts.html" @@ -754,7 +771,7 @@ author = RCoreTeam, organization = RFoundation, address = {Vienna, Austria}, - year = 2021, + year = 2023, title = "R internals", annote = {{ISBN} 3-900051-14-3}, url = manuals # "R-ints.html" @@ -764,7 +781,7 @@ author = RCoreTeam, organization = RFoundation, address = {Vienna, Austria}, - year = 2021, + year = 2023, title = "R language", annote = {{ISBN} 3-900051-13-5}, url = manuals # "R-lang.html" @@ -776,7 +793,7 @@ author = RCoreTeam, organization = RFoundation, address = {Vienna, Austria}, - year = 2021, + year = 2023, url = {https://www.R-project.org/} } Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/inst/doc/Rcpp-FAQ.pdf and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/inst/doc/Rcpp-FAQ.pdf differ Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/inst/doc/Rcpp-attributes.pdf and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/inst/doc/Rcpp-attributes.pdf differ Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/inst/doc/Rcpp-extending.pdf and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/inst/doc/Rcpp-extending.pdf differ Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/inst/doc/Rcpp-introduction.pdf and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/inst/doc/Rcpp-introduction.pdf differ Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/inst/doc/Rcpp-jss-2011.pdf and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/inst/doc/Rcpp-jss-2011.pdf differ Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/inst/doc/Rcpp-libraries.pdf and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/inst/doc/Rcpp-libraries.pdf differ Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/inst/doc/Rcpp-modules.pdf and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/inst/doc/Rcpp-modules.pdf differ Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/inst/doc/Rcpp-package.pdf and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/inst/doc/Rcpp-package.pdf differ Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/inst/doc/Rcpp-quickref.pdf and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/inst/doc/Rcpp-quickref.pdf differ Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/inst/doc/Rcpp-sugar.pdf and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/inst/doc/Rcpp-sugar.pdf differ diff -Nru rcpp-1.0.11/inst/include/Rcpp/config.h rcpp-1.0.12/inst/include/Rcpp/config.h --- rcpp-1.0.11/inst/include/Rcpp/config.h 2023-07-03 14:49:20.000000000 +0000 +++ rcpp-1.0.12/inst/include/Rcpp/config.h 2024-01-04 14:32:39.000000000 +0000 @@ -1,7 +1,7 @@ // config.h: Rcpp R/C++ interface class library -- Rcpp configuration // -// Copyright (C) 2010 - 2023 Dirk Eddelbuettel and Romain Francois +// Copyright (C) 2010 - 2024 Dirk Eddelbuettel and Romain Francois // // This file is part of Rcpp. // @@ -27,10 +27,10 @@ // the currently released version #define RCPP_VERSION Rcpp_Version(1,0,11) -#define RCPP_VERSION_STRING "1.0.11" +#define RCPP_VERSION_STRING "1.0.12" // 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,0) -#define RCPP_DEV_VERSION_STRING "1.0.11.0" +#define RCPP_DEV_VERSION RcppDevVersion(1,0,12,0) +#define RCPP_DEV_VERSION_STRING "1.0.12.0" #endif diff -Nru rcpp-1.0.11/inst/include/Rcpp/iostream/Rstreambuf.h rcpp-1.0.12/inst/include/Rcpp/iostream/Rstreambuf.h --- rcpp-1.0.11/inst/include/Rcpp/iostream/Rstreambuf.h 2021-02-01 21:43:56.000000000 +0000 +++ rcpp-1.0.12/inst/include/Rcpp/iostream/Rstreambuf.h 2023-11-24 15:15:08.000000000 +0000 @@ -1,9 +1,8 @@ -// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*- // // Rstreambuf.h: Rcpp R/C++ interface class library -- stream buffer // // Copyright (C) 2011 - 2020 Dirk Eddelbuettel, Romain Francois and Jelmer Ypma -// Copyright (C) 2021 Dirk Eddelbuettel, Romain Francois, Jelmer Ypma and Iñaki Ucar +// Copyright (C) 2021 - 2023 Dirk Eddelbuettel, Romain Francois, Jelmer Ypma and Iñaki Ucar // // This file is part of Rcpp. // @@ -50,11 +49,11 @@ }; // #nocov start template <> inline std::streamsize Rstreambuf::xsputn(const char *s, std::streamsize num) { - Rprintf("%.*s", num, s); + Rprintf("%.*s", static_cast(num), s); return num; } template <> inline std::streamsize Rstreambuf::xsputn(const char *s, std::streamsize num) { - REprintf("%.*s", num, s); + REprintf("%.*s", static_cast(num), s); return num; } diff -Nru rcpp-1.0.11/inst/include/Rcpp/print.h rcpp-1.0.12/inst/include/Rcpp/print.h --- rcpp-1.0.11/inst/include/Rcpp/print.h 2021-03-21 17:44:41.000000000 +0000 +++ rcpp-1.0.12/inst/include/Rcpp/print.h 2023-11-24 15:15:08.000000000 +0000 @@ -1,6 +1,5 @@ -// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; indent-tabs-mode: nil; -*- // -// Copyright (C) 2015 - 2016 Dirk Eddelbuettel +// Copyright (C) 2015 - 2023 Dirk Eddelbuettel // // This file is part of Rcpp. // @@ -27,7 +26,7 @@ } inline void warningcall(SEXP call, const std::string & s) { - Rf_warningcall(call, s.c_str()); + Rf_warningcall(call, "%s", s.c_str()); } // also note that warning() is defined in file exceptions.h @@ -35,4 +34,3 @@ } #endif - diff -Nru rcpp-1.0.11/inst/include/Rcpp/vector/MatrixColumn.h rcpp-1.0.12/inst/include/Rcpp/vector/MatrixColumn.h --- rcpp-1.0.11/inst/include/Rcpp/vector/MatrixColumn.h 2017-09-15 21:40:24.000000000 +0000 +++ rcpp-1.0.12/inst/include/Rcpp/vector/MatrixColumn.h 2023-10-27 21:10:22.000000000 +0000 @@ -129,7 +129,7 @@ ConstMatrixColumn( const MATRIX& parent, int i ) : n(parent.nrow()), - const_start(parent.begin() + i *n) + const_start(parent.begin() + static_cast(i) * n) { if( i < 0 || i >= parent.ncol() ) { const char* fmt = "Column index is out of bounds: " diff -Nru rcpp-1.0.11/inst/include/Rcpp/vector/MatrixRow.h rcpp-1.0.12/inst/include/Rcpp/vector/MatrixRow.h --- rcpp-1.0.11/inst/include/Rcpp/vector/MatrixRow.h 2017-09-30 12:54:29.000000000 +0000 +++ rcpp-1.0.12/inst/include/Rcpp/vector/MatrixRow.h 2023-10-27 21:10:22.000000000 +0000 @@ -169,7 +169,7 @@ } inline reference operator[]( int i ) const { - return parent[ row + i * parent_nrow ] ; + return parent[ row + static_cast(i) * parent_nrow ] ; } inline iterator begin(){ @@ -206,9 +206,9 @@ int parent_nrow ; int row ; - inline int get_parent_index(int i) const { - RCPP_DEBUG_4( "MatrixRow<%d>::get_parent_index(int = %d), parent_nrow = %d >> %d\n", RTYPE, i, parent_nrow, i*parent_nrow ) - return i * parent_nrow ; + inline R_xlen_t get_parent_index(int i) const { + RCPP_DEBUG_4( "MatrixRow<%d>::get_parent_index(int = %d), parent_nrow = %d >> %d\n", RTYPE, i, parent_nrow, static_cast(i) * parent_nrow ) + return static_cast(i) * parent_nrow ; } } ; @@ -310,7 +310,7 @@ {} ; inline const_reference operator[]( int i ) const { - return parent[ row + i * parent_nrow ] ; + return parent[ row + static_cast(i) * parent_nrow ] ; } inline const_iterator begin() const { @@ -331,9 +331,9 @@ int parent_nrow ; int row ; - inline int get_parent_index(int i) const { - RCPP_DEBUG_4( "ConstMatrixRow<%d>::get_parent_index(int = %d), parent_nrow = %d >> %d\n", RTYPE, i, parent_nrow, i*parent_nrow ) - return i * parent_nrow ; + inline R_xlen_t get_parent_index(int i) const { + RCPP_DEBUG_4( "ConstMatrixRow<%d>::get_parent_index(int = %d), parent_nrow = %d >> %d\n", RTYPE, i, parent_nrow, static_cast(i) * parent_nrow ) + return static_cast(i) * parent_nrow ; } } ; } diff -Nru rcpp-1.0.11/inst/include/Rcpp/vector/Vector.h rcpp-1.0.12/inst/include/Rcpp/vector/Vector.h --- rcpp-1.0.11/inst/include/Rcpp/vector/Vector.h 2023-01-09 16:04:56.000000000 +0000 +++ rcpp-1.0.12/inst/include/Rcpp/vector/Vector.h 2023-10-27 21:10:22.000000000 +0000 @@ -331,7 +331,7 @@ } inline iterator begin() { return cache.get() ; } - inline iterator end() { return cache.get() + static_cast(size()) ; } + inline iterator end() { return cache.get() + size() ; } inline const_iterator begin() const{ return cache.get_const() ; } inline const_iterator end() const{ return cache.get_const() + size() ; } inline const_iterator cbegin() const{ return cache.get_const() ; } diff -Nru rcpp-1.0.11/inst/tinytest/testRcppInterfaceExporter/R/RcppExports.R rcpp-1.0.12/inst/tinytest/testRcppInterfaceExporter/R/RcppExports.R --- rcpp-1.0.11/inst/tinytest/testRcppInterfaceExporter/R/RcppExports.R 2019-12-01 01:33:52.000000000 +0000 +++ rcpp-1.0.12/inst/tinytest/testRcppInterfaceExporter/R/RcppExports.R 2023-11-28 13:59:39.000000000 +0000 @@ -8,5 +8,5 @@ # Register entry points for exported C++ functions methods::setLoadAction(function(ns) { - .Call('_testRcppInterfaceExporter_RcppExport_registerCCallable', PACKAGE = 'testRcppInterfaceExporter') + .Call(`_testRcppInterfaceExporter_RcppExport_registerCCallable`) }) diff -Nru rcpp-1.0.11/inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp rcpp-1.0.12/inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp --- rcpp-1.0.11/inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp 2019-12-01 01:33:52.000000000 +0000 +++ rcpp-1.0.12/inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp 2023-11-28 13:59:39.000000000 +0000 @@ -8,6 +8,11 @@ using namespace Rcpp; +#ifdef RCPP_USE_GLOBAL_ROSTREAM +Rcpp::Rostream& Rcpp::Rcout = Rcpp::Rcpp_cout_get(); +Rcpp::Rostream& 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) { @@ -38,7 +43,7 @@ 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; diff -Nru rcpp-1.0.11/man/getRcppVersion.Rd rcpp-1.0.12/man/getRcppVersion.Rd --- rcpp-1.0.11/man/getRcppVersion.Rd 2019-04-27 14:52:20.000000000 +0000 +++ rcpp-1.0.12/man/getRcppVersion.Rd 2023-11-12 01:43:20.000000000 +0000 @@ -19,7 +19,7 @@ } \details{ While \code{packageVersion(Rcpp)} exports the version registers in -{DESCRIPTION}, this version does get incremented more easily +\code{DESCRIPTION}, this version does get incremented more easily during development and can therefore be higher than the released version. The actual \code{#define} long used at the C++ level corresponds more to an \sQuote{API Version} which is now provided diff -Nru rcpp-1.0.11/src/api.cpp rcpp-1.0.12/src/api.cpp --- rcpp-1.0.11/src/api.cpp 2023-03-26 18:41:04.000000000 +0000 +++ rcpp-1.0.12/src/api.cpp 2023-12-27 17:46:21.000000000 +0000 @@ -3,7 +3,7 @@ // api.cpp: Rcpp R/C++ interface class library -- Rcpp api // // Copyright (C) 2012 - 2020 Dirk Eddelbuettel and Romain Francois -// Copyright (C) 2021 Dirk Eddelbuettel, Romain Francois and Iñaki Ucar +// Copyright (C) 2021 - 2023 Dirk Eddelbuettel, Romain Francois and Iñaki Ucar // // This file is part of Rcpp. // @@ -89,30 +89,34 @@ // [[Rcpp::register]] const char * type2name(SEXP x) { // #nocov start switch (TYPEOF(x)) { - case NILSXP: return "NILSXP"; - case SYMSXP: return "SYMSXP"; - case RAWSXP: return "RAWSXP"; - case LISTSXP: return "LISTSXP"; - case CLOSXP: return "CLOSXP"; - case ENVSXP: return "ENVSXP"; - case PROMSXP: return "PROMSXP"; - case LANGSXP: return "LANGSXP"; + case NILSXP: return "NILSXP"; + case SYMSXP: return "SYMSXP"; + case RAWSXP: return "RAWSXP"; + case LISTSXP: return "LISTSXP"; + case CLOSXP: return "CLOSXP"; + case ENVSXP: return "ENVSXP"; + case PROMSXP: return "PROMSXP"; + case LANGSXP: return "LANGSXP"; case SPECIALSXP: return "SPECIALSXP"; case BUILTINSXP: return "BUILTINSXP"; - case CHARSXP: return "CHARSXP"; - case LGLSXP: return "LGLSXP"; - case INTSXP: return "INTSXP"; - case REALSXP: return "REALSXP"; - case CPLXSXP: return "CPLXSXP"; - case STRSXP: return "STRSXP"; - case DOTSXP: return "DOTSXP"; - case ANYSXP: return "ANYSXP"; - case VECSXP: return "VECSXP"; - case EXPRSXP: return "EXPRSXP"; - case BCODESXP: return "BCODESXP"; - case EXTPTRSXP: return "EXTPTRSXP"; + case CHARSXP: return "CHARSXP"; + case LGLSXP: return "LGLSXP"; + case INTSXP: return "INTSXP"; + case REALSXP: return "REALSXP"; + case CPLXSXP: return "CPLXSXP"; + case STRSXP: return "STRSXP"; + case DOTSXP: return "DOTSXP"; + case ANYSXP: return "ANYSXP"; + case VECSXP: return "VECSXP"; + case EXPRSXP: return "EXPRSXP"; + case BCODESXP: return "BCODESXP"; + case EXTPTRSXP: return "EXTPTRSXP"; case WEAKREFSXP: return "WEAKREFSXP"; - case S4SXP: return "S4SXP"; +#if R_Version >= R_Version(4,4,0) // replaces S4SXP in R 4.4.0 + case OBJSXP: return Rf_isS4(x) ? "S4SXP" : "OBJSXP"; // cf src/main/inspect.c +#else + case S4SXP: return "S4SXP"; +#endif default: return ""; } diff -Nru rcpp-1.0.11/src/attributes.cpp rcpp-1.0.12/src/attributes.cpp --- rcpp-1.0.11/src/attributes.cpp 2023-03-19 22:01:23.000000000 +0000 +++ rcpp-1.0.12/src/attributes.cpp 2023-11-26 18:33:06.000000000 +0000 @@ -31,6 +31,7 @@ #include #include #include +#include // for std::endl #include #include @@ -2960,7 +2961,7 @@ << " if (rcpp_isError_gen) {" << std::endl << " SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);" << std::endl << " UNPROTECT(1);" << std::endl - << " Rf_error(CHAR(rcpp_msgSEXP_gen));" << std::endl + << " Rf_error(\"%s\", CHAR(rcpp_msgSEXP_gen));" << std::endl << " }" << std::endl << " UNPROTECT(1);" << std::endl << " return rcpp_result_gen;" << std::endl diff -Nru rcpp-1.0.11/src/date.cpp rcpp-1.0.12/src/date.cpp --- rcpp-1.0.11/src/date.cpp 2023-01-09 16:04:56.000000000 +0000 +++ rcpp-1.0.12/src/date.cpp 2023-08-03 17:51:10.000000000 +0000 @@ -25,6 +25,7 @@ #define COMPILING_RCPP +#include // for TRUE,FALSE #include #include // for gmtime #include Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/vignettes/pdf/Rcpp-FAQ.pdf and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/vignettes/pdf/Rcpp-FAQ.pdf differ Binary files /tmp/tmp41ucmozk/FifBfa6MjJ/rcpp-1.0.11/vignettes/pdf/Rcpp-introduction.pdf and /tmp/tmp41ucmozk/nsd4NiEVxp/rcpp-1.0.12/vignettes/pdf/Rcpp-introduction.pdf differ