More Rcpp-idiomatic to avoid explicit PROTECT

romainfrancois · romainfrancois · commit a280acbc31a8 · 2019-11-01T10:23:43.000+01:00
diff --git a/inst/include/Rcpp/DataFrame.h b/inst/include/Rcpp/DataFrame.h
@@ -101,9 +101,8 @@ namespace Rcpp{
             if( ::Rf_inherits( x, "data.frame" )){
                 Parent::set__( x ) ;
             } else{
-                SEXP y = PROTECT(internal::convert_using_rfunction( x, "as.data.frame" )) ;
+                Shield<SEXP> y(internal::convert_using_rfunction( x, "as.data.frame" )) ;
                 Parent::set__( y ) ;
-                UNPROTECT(1);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,8 @@ namespace Rcpp{`
`101`	`101`	`if( ::Rf_inherits( x, "data.frame" )){`
`102`	`102`	`Parent::set__( x ) ;`
`103`	`103`	`} else{`
`104`		`- SEXP y = PROTECT(internal::convert_using_rfunction( x, "as.data.frame" )) ;`
	`104`	`+ Shield<SEXP> y(internal::convert_using_rfunction( x, "as.data.frame" )) ;`
`105`	`105`	`Parent::set__( y ) ;`
`106`		`- UNPROTECT(1);`
`107`	`106`	`}`
`108`	`107`	`}`
`109`	`108`