cleaning up as_module_object

romainfrancois · romainfrancois · commit cc6abcc2bfea · 2013-10-02T12:43:29.000+02:00
diff --git a/inst/include/Rcpp/Module.h b/inst/include/Rcpp/Module.h
@@ -58,17 +58,6 @@ namespace Rcpp{
         T* ptr;
     } ;
     
-    template <typename T>
-    class object {
-    public:
-        typedef T object_type ;
-        object( T* ptr_ ) : ptr(ptr_){}
-        operator T*(){ return ptr ; }
-        T* operator->(){ return ptr ; }
-        T& operator&(){ return *ptr ; }  
-        T* ptr ;
-    } ;
-
     namespace internal {
         template <typename Class>
         SEXP make_new_object( Class* ptr ){
diff --git a/inst/include/Rcpp/api/meat/meat.h b/inst/include/Rcpp/api/meat/meat.h
@@ -29,6 +29,7 @@
 #include <Rcpp/api/meat/Matrix.h>
 #include <Rcpp/api/meat/Reference.h>
 #include <Rcpp/api/meat/is.h>
+#include <Rcpp/api/meat/as.h>
 #include <Rcpp/api/meat/export.h>
 #include <Rcpp/api/meat/wrap.h>
 
diff --git a/inst/include/Rcpp/as.h b/inst/include/Rcpp/as.h
@@ -76,15 +76,10 @@ namespace Rcpp{
             return exporter.get() ;
         }
         
-        void* as_module_object_internal(SEXP) ;
-        template <typename T> object<T> as_module_object(SEXP x){
-            return (T*) as_module_object_internal(x) ;
-        }
+        template <typename T> T* as_module_object(SEXP x) ;
         
-        /** handling object<T> */ 
         template <typename T> T as(SEXP x, ::Rcpp::traits::r_type_module_object_const_pointer_tag ) {
-            typedef typename std::remove_const<T>::type T_NON_CONST ;
-            return const_cast<T>( (T_NON_CONST)as_module_object_internal(x) ) ;
+            return const_cast<T>( as_module_object< typename std::remove_const<T>::type >( x ) ) ; 
         }
         
         template <typename T> T as(SEXP x, ::Rcpp::traits::r_type_module_object_pointer_tag ) {
diff --git a/inst/include/Rcpp/traits/wrap_type_traits.h b/inst/include/Rcpp/traits/wrap_type_traits.h
@@ -32,11 +32,6 @@ struct wrap_type_primitive_tag{};
  * unknown. Implicit conversion to SEXP will be tried.
  */
 struct wrap_type_unknown_tag{};
-
-/**
- * module objects pointers (object<T>). conversion done using make_new_object<>() 
- */
-struct wrap_type_module_object_pointer_tag{} ;
  
 /**
  * declared module object type (by the RCPP_EXPOSED_CLASS macro)
@@ -88,9 +83,6 @@ template <> struct wrap_type_traits<long double> { typedef wrap_type_primitive_t
 template <> struct wrap_type_traits<short> { typedef wrap_type_primitive_tag wrap_category; } ;
 template <> struct wrap_type_traits<unsigned short> { typedef wrap_type_primitive_tag wrap_category; } ;
 
-template <typename T> struct wrap_type_traits< Rcpp::object<T> > { typedef wrap_type_module_object_pointer_tag wrap_category; } ;
-
-
 } // namespace traits
 } // namespace Rcpp
 #endif
diff --git a/src/Module.cpp b/src/Module.cpp
@@ -495,13 +495,5 @@ namespace Rcpp{
         return it->second ;	
 	}
 	
-	namespace internal{
-	    void* as_module_object_internal(SEXP obj){
-	        Environment env(obj) ;
-	        SEXP xp = env.get(".pointer") ;
-	        return R_ExternalPtrAddr(xp );
-	    }
-	}
-	
 }
 

Original file line number	Diff line number	Diff line change
`@@ -495,13 +495,5 @@ namespace Rcpp{`
`495`	`495`	`return it->second ;`
`496`	`496`	`}`
`497`	`497`
`498`		`- namespace internal{`
`499`		`- void* as_module_object_internal(SEXP obj){`
`500`		`- Environment env(obj) ;`
`501`		`- SEXP xp = env.get(".pointer") ;`
`502`		`- return R_ExternalPtrAddr(xp );`
`503`		`- }`
`504`		`- }`
`505`		`-`
`506`	`498`	`}`
`507`	`499`