Merge pull request #7 from Enchufa2/master

switch to define following RcppCore/Rcpp#1227
david-cortes · Jul 27, 2022 · bb85a13 · bb85a13
2 parents f72a2cb + 5b7c1c7
commit bb85a13
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,4 +1,4 @@
-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)
 CXX_STD = CXX11
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,4 +1,4 @@
-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)
 CXX_STD = CXX11
diff --git a/src/Rwrapper.cpp b/src/Rwrapper.cpp
@@ -3,7 +3,6 @@
 #include <Rcpp.h>
 #include <Rcpp/unwindProtect.h>
 // [[Rcpp::plugins(cpp11)]]
-// [[Rcpp::plugins(unwindProtect)]]
 
 /* This is to serialize the model objects */
 // [[Rcpp::depends(Rcereal)]]