clean up some more usages

Author: kevinushey

ChangeLog

@@ -1,6 +1,9 @@
 2017-12-04  Kevin Ushey  <[email protected]>
 
-        * inst/include/Rcpp/api/meat/proxy.h: Protect temporary SEXP
+        * inst/include/Rcpp/RObject.h: Protect temporary wrapped SEXPs
+        * inst/include/Rcpp/api/meat/DataFrame.h: Idem
+        * inst/include/Rcpp/api/meat/Environment.h: Idem
+        * inst/include/Rcpp/api/meat/proxy.h: Idem
         * inst/include/Rcpp/proxy/ProtectedProxy.h: Idem
         * inst/include/Rcpp/vector/generic_proxy.h: Idem
 

inst/include/Rcpp/RObject.h

@@ -48,7 +48,7 @@ namespace Rcpp{
          */
         template <typename T>
         RObject_Impl& operator=(const T& other) {
-            Storage::set__( wrap(other) ) ;
+            Storage::set__(Shield<SEXP>(wrap(other)));
             return *this;
         }
 

inst/include/Rcpp/api/meat/DataFrame.h

@@ -23,7 +23,7 @@ namespace Rcpp{
      template <template <class> class StoragePolicy>
      template <class T>
      DataFrame_Impl<StoragePolicy>::DataFrame_Impl( const T& obj){
-        set__( wrap(obj) ) ;
+        set__(Shield<SEXP>(wrap(obj)));
      }
 
 }

inst/include/Rcpp/api/meat/Environment.h

@@ -27,7 +27,7 @@ namespace Rcpp{
 template <template <class> class StoragePolicy>
 template <typename WRAPPABLE>
 bool Environment_Impl<StoragePolicy>::assign( const std::string& name, const WRAPPABLE& x) const {
-    return assign( name, wrap( x ) ) ;
+    return assign(name, Shield<SEXP>(wrap(x)));
 }
 
 template <template <class> class StoragePolicy>

inst/include/Rcpp/api/meat/proxy.h

@@ -184,9 +184,7 @@ template <typename CLASS>
 template <typename T>
 typename FieldProxyPolicy<CLASS>::FieldProxy&
 FieldProxyPolicy<CLASS>::FieldProxy::operator=(const T& rhs) {
-    SEXP tmp = PROTECT(wrap(rhs));
-    set(tmp);
-    UNPROTECT(1);
+    set(Shield<SEXP>(wrap(rhs)));
     return *this;
 }
 

inst/include/Rcpp/vector/proxy.h

@@ -151,7 +151,7 @@ namespace internal{
 
 		template <typename T>
 		generic_name_proxy& operator=( const T& rhs ){
-			set( ::Rcpp::wrap(rhs) ) ;
+		    set(Shield<SEXP>(wrap(rhs)));
 			return *this ;
 		}
 
@@ -249,7 +249,7 @@ namespace traits {
 	template<> struct r_vector_iterator<VECSXP> : proxy_based_iterator<VECSXP>{} ;
 	template<> struct r_vector_iterator<EXPRSXP> : proxy_based_iterator<EXPRSXP>{} ;
 	template<> struct r_vector_iterator<STRSXP> : proxy_based_iterator<STRSXP>{} ;
-	
+
 	template <int RTYPE> struct proxy_based_const_iterator{
 		typedef ::Rcpp::internal::Proxy_Iterator< typename r_vector_const_proxy<RTYPE>::type > type ;
 	} ;