Changeset 3585

Timestamp:

Jan 19, 2017, 6:01:19 AM (7 years ago)

Author:

Peter

Message:

move constructor and move assignment for utility::Matrix; refs #878

Location:

trunk/yat/utility

Files:

• Matrix.cc (modified) (2 diffs)
• Matrix.h (modified) (3 diffs)

trunk/yat/utility/Matrix.cc

@@ -68 +68 @@
   {
   }
+
+
+#ifdef YAT_HAVE_RVALUE
+  Matrix::Matrix(Matrix&& other)
+    : blas_result_(NULL), m_(NULL)
+  {
+    std::swap(m_, other.m_);
+  }
+#endif
 
 
@@ -431 +440 @@
 
 
+#ifdef YAT_HAVE_RVALUE
+  Matrix& Matrix::operator=(Matrix&& other)
+  {
+    std::swap(m_, other.m_);
+    return *this;
+  }
+#endif
+
+
   const Matrix& Matrix::operator+=(const Matrix& other)
   {

trunk/yat/utility/Matrix.h

@@ -26 +26 @@
   along with yat. If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include "config_public.h"
 
 #include "Exception.h"
@@ -141 +143 @@
     Matrix(const Matrix&);
 
+#ifdef YAT_HAVE_RVALUE
+    /**
+       \brief The move constructor.
+    */
+    Matrix(Matrix&&);
+#endif
+
     /**
        \brief The istream constructor.
@@ -432 +441 @@
     */
     const Matrix& operator=(const Matrix& other);
+
+#ifdef YAT_HAVE_RVALUE
+    /**
+       \brief Move assignment operator
+     */
+    Matrix& operator=(Matrix&& other);
+#endif
 
     /**