use parentheses instead to prevent masking of individual calls

Author: Enchufa2

ChangeLog

@@ -12,7 +12,7 @@
 	* inst/include/Rcpp/macros/mask.h: Mask Rf_error with Rcpp::stop with
 	a warning at compilation time, unless RCPP_NO_MASK_RF_ERROR is defined
 	* inst/include/RcppCommon.h: Include the previous file in the last place
-	* src/attributes.cpp: Use RCPP_NO_MASK to protect call to Rf_error
+	* src/attributes.cpp: Use parentheses to protect call to Rf_error
 	* inst/tinytest/cpp/stack.cpp: Idem
 	* inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp: Idem
 

inst/include/Rcpp/macros/mask.h

@@ -20,9 +20,6 @@
 #ifndef Rcpp_macros_mask_h
 #define Rcpp_macros_mask_h
 
-#define RCPP_NO_MASK_EMPTY()
-#define RCPP_NO_MASK(id) id RCPP_NO_MASK_EMPTY()
-
 #ifndef RCPP_NO_MASK_RF_ERROR
 #define Rf_error(...) \
     _Pragma("GCC warning \"Use of Rf_error() replaced with Rcpp::stop(). Calls \

inst/tinytest/cpp/stack.cpp

@@ -56,7 +56,7 @@ SEXP testSendInterrupt() {
 SEXP maybeThrow(void* data) {
     bool* fail = (bool*) data;
     if (*fail)
-        RCPP_NO_MASK(Rf_error)("throw!");
+        (Rf_error)("throw!"); // prevent masking
     else
         return NumericVector::create(42);
 }

inst/tinytest/testRcppInterfaceExporter/src/RcppExports.cpp

@@ -43,11 +43,7 @@ RcppExport SEXP _testRcppInterfaceExporter_test_cpp_interface(SEXP xSEXP, SEXP f
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-    #ifdef RCPP_NO_MASK
-        RCPP_NO_MASK(Rf_error)("%s", CHAR(rcpp_msgSEXP_gen));
-    #else
-        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
-    #endif
+        (Rf_error)("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;

src/attributes.cpp

@@ -2953,11 +2953,8 @@ namespace attributes {
                      << "    if (rcpp_isError_gen) {" << std::endl
                      << "        SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);" << std::endl
                      << "        UNPROTECT(1);" << std::endl
-                     << "    #ifdef RCPP_NO_MASK" << std::endl
-                     << "        RCPP_NO_MASK(Rf_error)(\"%s\", CHAR(rcpp_msgSEXP_gen));" << std::endl
-                     << "    #else" << std::endl
-                     << "        Rf_error(\"%s\", CHAR(rcpp_msgSEXP_gen));" << std::endl
-                     << "    #endif" << std::endl
+                                 // Parentheses to prevent masking
+                     << "        (Rf_error)(\"%s\", CHAR(rcpp_msgSEXP_gen));" << std::endl
                      << "    }" << std::endl
                      << "    UNPROTECT(1);" << std::endl
                      << "    return rcpp_result_gen;" << std::endl