From 5c97b48c29b85ffd8fd6c9a5f54b0d6b34653e93 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 30 Nov 2018 21:25:51 +0100 Subject: [PATCH] bug #1634: remove double copy in move-ctor of non movable Matrix/Array (grafted from ab4df3e6ff530ab520884bdbf44d61b53b1ee05f ) --- Eigen/src/Core/Array.h | 2 -- Eigen/src/Core/Matrix.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/Eigen/src/Core/Array.h b/Eigen/src/Core/Array.h index e10020d4f..16770fc7b 100644 --- a/Eigen/src/Core/Array.h +++ b/Eigen/src/Core/Array.h @@ -153,8 +153,6 @@ class Array : Base(std::move(other)) { Base::_check_template_params(); - if (RowsAtCompileTime!=Dynamic && ColsAtCompileTime!=Dynamic) - Base::_set_noalias(other); } EIGEN_DEVICE_FUNC Array& operator=(Array&& other) EIGEN_NOEXCEPT_IF(std::is_nothrow_move_assignable::value) diff --git a/Eigen/src/Core/Matrix.h b/Eigen/src/Core/Matrix.h index 90c336d8c..7f4a7af93 100644 --- a/Eigen/src/Core/Matrix.h +++ b/Eigen/src/Core/Matrix.h @@ -274,8 +274,6 @@ class Matrix : Base(std::move(other)) { Base::_check_template_params(); - if (RowsAtCompileTime!=Dynamic && ColsAtCompileTime!=Dynamic) - Base::_set_noalias(other); } EIGEN_DEVICE_FUNC Matrix& operator=(Matrix&& other) EIGEN_NOEXCEPT_IF(std::is_nothrow_move_assignable::value)