enable unwind protection by default

Author: Enchufa2

R/Attributes.R

@@ -1,5 +1,5 @@
 
-# Copyright (C) 2012 - 2021  JJ Allaire, Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2012 - 2022  JJ Allaire, Dirk Eddelbuettel and Romain Francois
 #
 # This file is part of Rcpp.
 #
@@ -562,9 +562,11 @@ compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose")) {
                     PKG_LIBS="-fopenmp"))
 }
 
-.plugins[["unwindProtect"]] <- function() {
-    list(env = list(PKG_CPPFLAGS = "-DRCPP_USE_UNWIND_PROTECT"))
-}
+.plugins[["unwindProtect"]] <- function() { # nocov start
+    warning("unwindProtect is enabled by default and this plugin is deprecated.",
+            " It will be removed in a future version of Rcpp.")
+    list()
+} # nocov end
 
 # register a plugin
 registerPlugin <- function(name, plugin) {

inst/include/Rcpp/r/headers.h

@@ -95,7 +95,7 @@
 # pragma pop_macro("makedev")
 #endif
 
-#if (defined(RCPP_USE_UNWIND_PROTECT) && defined(R_VERSION) && R_VERSION >= R_Version(3, 5, 0))
+#if (!defined(RCPP_NO_UNWIND_PROTECT) && defined(R_VERSION) && R_VERSION >= R_Version(3, 5, 0))
 # define RCPP_USING_UNWIND_PROTECT
 #endif
 

inst/tinytest/cpp/stack.cpp

@@ -2,7 +2,7 @@
 //
 // misc.cpp: Rcpp R/C++ interface class library -- misc unit tests
 //
-// Copyright (C) 2013 - 2015  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2013 - 2022  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -19,7 +19,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-// [[Rcpp::plugins(unwindProtect,cpp11)]]
+// [[Rcpp::plugins(cpp11)]]
 
 #include <Rcpp.h>
 using namespace Rcpp;

inst/tinytest/testRcppInterfaceExporter/src/config.h

@@ -1,5 +1,5 @@
 
-##  Copyright (C) 2018 - 2019  RStudio
+##  Copyright (C) 2018 - 2022  RStudio
 ##
 ##  This file is part of Rcpp.
 ##
@@ -64,9 +64,8 @@ on.exit(Sys.setenv(R_LIBS = old_libs_envvar), add = TRUE)
 sys_sep <- if (.Platform$OS.type == "windows") ";" else ":"
 Sys.setenv(R_LIBS = paste(c(lib_path, old_lib_paths), collapse = sys_sep))
 
-cfg <- "#define RCPP_USE_UNWIND_PROTECT"
-build_package(exporter_name, lib_path, config = cfg)
-build_package(user_name, lib_path, config = cfg)
+build_package(exporter_name, lib_path)
+build_package(user_name, lib_path)
 
 result <- tools::testInstalledPackage(user_name, lib.loc = lib_path, types = "test")
 
@@ -82,7 +81,7 @@ expect_equal(result, 0L)
 ## Now test client package without protected evaluation
 unlink(user_name, recursive = TRUE)
 unlink(paste0(user_name, "-tests"), recursive = TRUE)
-build_package(user_name, lib_path, config = character())
+build_package(user_name, lib_path, config = "#define RCPP_NO_UNWIND_PROTECT")
 
 result <- tools::testInstalledPackage(user_name, lib.loc = lib_path, types = "test")