From dfe3a6e04909d0c9e20a2a888a71b0fc1b269b03 Mon Sep 17 00:00:00 2001 From: fbourgin Date: Wed, 5 Nov 2025 20:07:49 +0100 Subject: [PATCH 1/3] upgraded to C++17 --- src/Makevars | 2 +- src/Makevars.win | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makevars b/src/Makevars index 931b823..25aa53b 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,4 +1,4 @@ ## -*- mode: makefile; -*- -PKG_CXXFLAGS = -I../inst/include --std=c++14 +PKG_CXXFLAGS = -I../inst/include --std=c++17 # CXX_STD = CXX14 diff --git a/src/Makevars.win b/src/Makevars.win index 931b823..25aa53b 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,4 +1,4 @@ ## -*- mode: makefile; -*- -PKG_CXXFLAGS = -I../inst/include --std=c++14 +PKG_CXXFLAGS = -I../inst/include --std=c++17 # CXX_STD = CXX14 From 4c1c006f0fdc165a8bea1314a2a2e9d7990b6871 Mon Sep 17 00:00:00 2001 From: fbourgin Date: Wed, 5 Nov 2025 20:55:50 +0100 Subject: [PATCH 2/3] update xtensor includes --- src/xtensor_r_example.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xtensor_r_example.cpp b/src/xtensor_r_example.cpp index 4206d9c..9ffff3d 100644 --- a/src/xtensor_r_example.cpp +++ b/src/xtensor_r_example.cpp @@ -2,9 +2,9 @@ #include "xtensor-r/rarray.hpp" #include "xtensor-r/rtensor.hpp" -#include "xtensor/xio.hpp" -#include "xtensor/xinfo.hpp" -#include "xtensor/xarray.hpp" +#include "xtensor/io/xio.hpp" +#include "xtensor/io/xinfo.hpp" +#include "xtensor/containers/xarray.hpp" #include From 018da137ce4ace85884ea9021081a5fc1c1c96f7 Mon Sep 17 00:00:00 2001 From: fbourgin Date: Wed, 5 Nov 2025 20:56:12 +0100 Subject: [PATCH 3/3] upgraded to C++17 --- src/xtensor_r_example.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xtensor_r_example.cpp b/src/xtensor_r_example.cpp index 9ffff3d..f78ca11 100644 --- a/src/xtensor_r_example.cpp +++ b/src/xtensor_r_example.cpp @@ -8,7 +8,7 @@ #include -// [[Rcpp::plugins(cpp14)]] +// [[Rcpp::plugins(cpp17)]] // [[Rcpp::export]] xt::rtensor xtensor_r_example(xt::rtensor tens)