From 6fced069f067d9908c3937569e1b1875d24c1d51 Mon Sep 17 00:00:00 2001 From: Dirk Eddelbuettel Date: Sun, 28 Sep 2025 15:36:54 +0200 Subject: [PATCH] Remove obsolete CXX_STD = CXX11 to allow Armadillo 15.0.x migration --- src/Makevars | 12 ------------ src/Makevars.win | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/src/Makevars b/src/Makevars index d3e3f41..f18428c 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,14 +1,2 @@ - -## With R 3.1.0 or later, you can uncomment the following line to tell R to -## enable compilation with C++11 (where available) -## -## Also, OpenMP support in Armadillo prefers C++11 support. However, for wider -## availability of the package we do not yet enforce this here. It is however -## recommended for client packages to set it. -## -## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP -## support within Armadillo prefers / requires it -CXX_STD = CXX11 - PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) diff --git a/src/Makevars.win b/src/Makevars.win index d3e3f41..f18428c 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,14 +1,2 @@ - -## With R 3.1.0 or later, you can uncomment the following line to tell R to -## enable compilation with C++11 (where available) -## -## Also, OpenMP support in Armadillo prefers C++11 support. However, for wider -## availability of the package we do not yet enforce this here. It is however -## recommended for client packages to set it. -## -## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP -## support within Armadillo prefers / requires it -CXX_STD = CXX11 - PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)