move CppClass and CppObject to headers

Author: romainfrancois

inst/include/Rcpp/Module.h

@@ -419,8 +419,7 @@ namespace Rcpp {
 	    }
 
         CppClass& operator=( const CppClass& other) {
-            Storage::copy__( static_cast<const S4&>(other) ) ;
-            return *this ;
+            return Storage::copy__( other ) ;
         }
 
     } ;
@@ -433,8 +432,13 @@ namespace Rcpp {
             slot( "cppclass" ) = Rcpp::XPtr<class_Base>( clazz, false ) ;
             slot( "pointer" )  = xp ;
         }
-        CppObject( const CppObject& ) ;
-        CppObject& operator=( const CppObject& ) ;
+        CppObject( const CppObject& other){
+            Storage::copy( other ) ;    
+        }
+        
+        CppObject& operator=( const CppObject& other ) {
+            return Storage::copy__( other ) ;    
+        }
 
     } ;
 

inst/include/Rcpp/storage/PreserveStorage.h

@@ -32,11 +32,12 @@ namespace Rcpp{
             return out ;
         }
 
-        inline CLASS& copy__(const CLASS& other){
+        template <typename T>
+        inline T& copy__(const T& other){
             if( this != &other){
                 set__(other.get__());
             }
-            return static_cast<CLASS&>(*this) ;
+            return static_cast<T&>(*this) ;
         }
 
         inline bool inherits(const char* clazz) const { 

src/Module.cpp

@@ -241,12 +241,6 @@ extern "C" void R_init_Rcpp( DllInfo* info){
 
 namespace Rcpp{
 
-	CppObject::CppObject( const CppObject& other) : S4(other.asSexp()){}
-	CppObject& CppObject::operator=( const CppObject& other){
-	    setSEXP( other.asSexp() ) ;
-	    return *this ;
-	}
-	
 	namespace internal{
 	    void* as_module_object_internal(SEXP obj){
 	        Environment env(obj) ;