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/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) 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" ]