From a4831a00120b24537441168d74eacdbbdccc7e32 Mon Sep 17 00:00:00 2001 From: fbourgin Date: Thu, 6 Nov 2025 09:52:02 +0100 Subject: [PATCH 1/2] upgraded to C++20 --- src/Makevars | 2 +- src/Makevars.win | 2 +- src/xtensor_r_example.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makevars b/src/Makevars index 25aa53b..fd2482b 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,4 +1,4 @@ ## -*- mode: makefile; -*- -PKG_CXXFLAGS = -I../inst/include --std=c++17 +PKG_CXXFLAGS = -I../inst/include --std=c++20 -D_LIBCPP_DISABLE_AVAILABILITY # CXX_STD = CXX14 diff --git a/src/Makevars.win b/src/Makevars.win index 25aa53b..1fc2b6e 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,4 +1,4 @@ ## -*- mode: makefile; -*- -PKG_CXXFLAGS = -I../inst/include --std=c++17 +PKG_CXXFLAGS = -I../inst/include --std=c++20 # CXX_STD = CXX14 diff --git a/src/xtensor_r_example.cpp b/src/xtensor_r_example.cpp index f78ca11..0b1bacd 100644 --- a/src/xtensor_r_example.cpp +++ b/src/xtensor_r_example.cpp @@ -8,7 +8,7 @@ #include -// [[Rcpp::plugins(cpp17)]] +// [[Rcpp::plugins(cpp20)]] // [[Rcpp::export]] xt::rtensor xtensor_r_example(xt::rtensor tens) From f8f435601a19dbd3ab23e183cf7ba4aa0b422e8a Mon Sep 17 00:00:00 2001 From: fbourgin Date: Tue, 25 Nov 2025 16:12:23 +0100 Subject: [PATCH 2/2] update xtensor-r and xtensor --- .github/actions/unix_impl/action.yml | 2 +- tools/vendor | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/unix_impl/action.yml b/.github/actions/unix_impl/action.yml index 7d6205f..97ebfd8 100644 --- a/.github/actions/unix_impl/action.yml +++ b/.github/actions/unix_impl/action.yml @@ -19,7 +19,7 @@ runs: make install; cd ../..; else - micromamba install xtensor-r==0.16.0 -c conda-forge; + micromamba install xtensor-r==0.17.0 -c conda-forge; fi shell: bash -e -l {0} diff --git a/tools/vendor b/tools/vendor index 5255fde..e325285 100755 --- a/tools/vendor +++ b/tools/vendor @@ -1,7 +1,7 @@ XTL_VERSION=0.8.1 XSIMD_VERSION=13.2.1 -XTENSOR_VERSION=0.26.0 -XTENSOR_R_VERSION=0.16.0 +XTENSOR_VERSION=0.27.0 +XTENSOR_R_VERSION=0.17.0 # xtl if [ -d "./inst/include/xtl" ]