move semantics also for matrix

romainfrancois · romainfrancois · commit d86590a91376 · 2013-09-26T14:28:13.000+02:00
diff --git a/inst/include/Rcpp/api/meat/Matrix.h b/inst/include/Rcpp/api/meat/Matrix.h
@@ -53,6 +53,30 @@ namespace Rcpp{
     template <int RTYPE>
     Matrix<RTYPE>::Matrix( const Matrix& other) : VECTOR( other.asSexp() ), nrows(other.nrows) {}
     
+        
+    template <int RTYPE>
+    Matrix<RTYPE>::Matrix( Matrix<RTYPE>&& other) : VECTOR(){
+        RObject::m_sexp = other.m_sexp ;
+        RCPP_DEBUG_MOVE_CTOR( Matrix, "( %s&& other ), SEXP= <%p>", DEMANGLE(Matrix), m_sexp )
+        other.m_sexp = R_NilValue ;
+        VECTOR::update_vector() ;
+        nrows = other.nrows ;
+    }
+    
+    template <int RTYPE>
+    Matrix<RTYPE>& Matrix<RTYPE>::operator=( Matrix<RTYPE>&& other) {
+        RCPP_DEBUG_CLASS( Matrix, "::operator=( %s&& )", DEMANGLE(Matrix) )
+        if( this != &other ){
+            Rcpp_ReleaseObject(RObject::m_sexp) ;
+            RObject::m_sexp = other.m_sexp ;
+            other.m_sexp = R_NilValue ;
+            VECTOR::update_vector() ;
+            nrows = other.nrows ;
+        }
+        return *this ;
+    }
+
+    
     template <int RTYPE>
     template <bool NA, typename MAT>
     Matrix<RTYPE>::Matrix( const MatrixBase<RTYPE,NA,MAT>& other ) : VECTOR( Rf_allocMatrix( RTYPE, other.nrow(), other.ncol() ) ), nrows(other.nrow()) {
diff --git a/inst/include/Rcpp/vector/Matrix.h b/inst/include/Rcpp/vector/Matrix.h
@@ -1,7 +1,5 @@
-//
-// Matrix.h:  matrices
-//
 // Copyright (C) 2010 - 2012 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2013 Romain Francois
 //
 // This file is part of Rcpp11.
 //
@@ -54,6 +52,8 @@ class Matrix : public Vector<RTYPE>, public MatrixBase<RTYPE,true, Matrix<RTYPE>
     Matrix( const int& nrows_, const int& ncols, Iterator start ) ;
         
     Matrix( const Matrix& other)  ;
+    Matrix( Matrix&& other ) ;
+    Matrix& operator=( Matrix&& other) ;
         
     template <bool NA, typename MAT>
     Matrix( const MatrixBase<RTYPE,NA,MAT>& other )  ;
