Accommodate changes in BH 1.87.0-0
As described over on GitHub in https://github.com/eddelbuettel/bh/issues/103 I am preparing BH 1.87.0-0 for CRAN, and RcppUUID failed to compile. The change is simple: apparently the updated Boost uuic class no longer works with the Rcpp StringVector so I swapped it out for std::vectorstd::string. While at it I removed the two enforced C++11 compilation standard setters we once needed, but which CRAN now wants us to remove.
It would be awesome if you could fold this in and release an updated RcppUUID to CRAN. Many thanks in advance!
diff -ru RcppUUID.orig/src/Makevars RcppUUID/src/Makevars
--- RcppUUID.orig/src/Makevars 2020-05-03 18:10:27.000000000 +0200
+++ RcppUUID/src/Makevars 2024-12-13 14:58:59.313177800 +0100
@@ -1,2 +1 @@
-CXX_STD = CXX11
PKG_CXXFLAGS = -DRCPP_NO_MODULES
diff -ru RcppUUID.orig/src/Makevars.win RcppUUID/src/Makevars.win
--- RcppUUID.orig/src/Makevars.win 2020-05-03 18:10:27.000000000 +0200
+++ RcppUUID/src/Makevars.win 2024-12-13 14:56:34.141265785 +0100
@@ -1,2 +1 @@
-CXX_STD = CXX11
PKG_CXXFLAGS = -DRCPP_NO_MODULES
diff -ru RcppUUID.orig/src/RcppExports.cpp RcppUUID/src/RcppExports.cpp
--- RcppUUID.orig/src/RcppExports.cpp 2022-01-27 17:59:17.000000000 +0100
+++ RcppUUID/src/RcppExports.cpp 2024-12-13 14:54:10.449443143 +0100
@@ -11,11 +11,11 @@
#endif
// uuid_generate_name
-StringVector uuid_generate_name(StringVector x, const std::string& ns);
+StringVector uuid_generate_name(std::vector<std::string> x, const std::string& ns);
RcppExport SEXP _RcppUUID_uuid_generate_name(SEXP xSEXP, SEXP nsSEXP) {
BEGIN_RCPP
Rcpp::RObject rcpp_result_gen;
- Rcpp::traits::input_parameter< StringVector >::type x(xSEXP);
+ Rcpp::traits::input_parameter< std::vector<std::string> >::type x(xSEXP);
Rcpp::traits::input_parameter< const std::string& >::type ns(nsSEXP);
rcpp_result_gen = Rcpp::wrap(uuid_generate_name(x, ns));
return rcpp_result_gen;
diff -ru RcppUUID.orig/src/uuid_name.cpp RcppUUID/src/uuid_name.cpp
--- RcppUUID.orig/src/uuid_name.cpp 2021-03-08 16:36:42.000000000 +0100
+++ RcppUUID/src/uuid_name.cpp 2024-12-13 14:53:45.180070604 +0100
@@ -48,7 +48,7 @@
//' uuid_generate_name(c("one", "two"))
//'
// [[Rcpp::export(rng=false)]]
-StringVector uuid_generate_name(StringVector x, const std::string& ns = "x500dn") {
+StringVector uuid_generate_name(std::vector<std::string> x, const std::string& ns = "x500dn") {
std::vector<uuid> res(x.size());
name_generator_sha1 gen(str2ns(ns));
std::transform(x.begin(), x.end(), res.begin(), gen);