Merge pull request #1 from Enchufa2/master

switch to define following RcppCore/Rcpp#1227
david-cortes · Jul 27, 2022 · 2b91403 · 2b91403
2 parents 2f43aca + 169194a
commit 2b91403
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/Makevars.in b/src/Makevars.in
@@ -1,5 +1,5 @@
 FLOAT_LIBS = `${R_HOME}/bin${R_ARCH_BIN}/Rscript -e "float:::ldflags(static=Sys.info()[['sysname']] == 'Darwin')"`
 CXX_STD = CXX11
-PKG_CPPFLAGS = -D_FOR_R @SUPPORTS_RESTRICT@
+PKG_CPPFLAGS = -DRCPP_USE_UNWIND_PROTECT -D_FOR_R @SUPPORTS_RESTRICT@
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) @FNE_FLAG@ @FNTP_FLAG@ $(CXX_VISIBILITY)
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(BLAS_LIBS) $(FLIBS) $(FLOAT_LIBS)
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,5 +1,5 @@
 FLOAT_LIBS = `${R_HOME}/bin${R_ARCH_BIN}/Rscript -e "float:::ldflags(static=Sys.info()[['sysname']] == 'Darwin')"`
 CXX_STD = CXX11
-PKG_CPPFLAGS = -D_FOR_R
+PKG_CPPFLAGS = -DRCPP_USE_UNWIND_PROTECT -D_FOR_R
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -fno-trapping-math -fno-math-errno
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(BLAS_LIBS) $(FLIBS) $(FLOAT_LIBS)
diff --git a/src/Rwrapper.cpp b/src/Rwrapper.cpp
@@ -30,7 +30,6 @@
 #include <Rcpp.h>
 #include <Rcpp/unwindProtect.h>
 // [[Rcpp::plugins(cpp11)]]
-// [[Rcpp::plugins(unwindProtect)]]
 extern "C" {
 #include <Rinternals.h>
 }