From b868bfb84a4a86231bb338e9bcf08afd882d32dc Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Wed, 25 Jun 2014 17:23:52 +0200
Subject: Make operator=(EigenBase<>) uses the new assignment mechanism and
 introduce a generic EigenBase to EigenBase assignment kind based on the
 previous evalTo mechanism.

---
 Eigen/src/Core/DiagonalMatrix.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'Eigen/src/Core/DiagonalMatrix.h')

diff --git a/Eigen/src/Core/DiagonalMatrix.h b/Eigen/src/Core/DiagonalMatrix.h
index ba0042ba4..fc9ecf561 100644
--- a/Eigen/src/Core/DiagonalMatrix.h
+++ b/Eigen/src/Core/DiagonalMatrix.h
@@ -44,6 +44,8 @@ class DiagonalBase : public EigenBase<Derived>
 
     EIGEN_DEVICE_FUNC
     DenseMatrixType toDenseMatrix() const { return derived(); }
+    
+#ifndef EIGEN_TEST_EVALUATORS
     template<typename DenseDerived>
     EIGEN_DEVICE_FUNC
     void evalTo(MatrixBase<DenseDerived> &other) const;
@@ -55,6 +57,7 @@ class DiagonalBase : public EigenBase<Derived>
     EIGEN_DEVICE_FUNC
     void subTo(MatrixBase<DenseDerived> &other) const
     { other.diagonal() -= diagonal(); }
+#endif // EIGEN_TEST_EVALUATORS
 
     EIGEN_DEVICE_FUNC
     inline const DiagonalVectorType& diagonal() const { return derived().diagonal(); }
@@ -122,6 +125,7 @@ class DiagonalBase : public EigenBase<Derived>
     #endif
 };
 
+#ifndef EIGEN_TEST_EVALUATORS
 template<typename Derived>
 template<typename DenseDerived>
 void DiagonalBase<Derived>::evalTo(MatrixBase<DenseDerived> &other) const
@@ -129,6 +133,8 @@ void DiagonalBase<Derived>::evalTo(MatrixBase<DenseDerived> &other) const
   other.setZero();
   other.diagonal() = diagonal();
 }
+#endif // EIGEN_TEST_EVALUATORS
+
 #endif
 
 /** \class DiagonalMatrix
@@ -376,6 +382,21 @@ struct evaluator_traits<DiagonalWrapper<Derived> >
   static const int AssumeAliasing = 0;
 };
 
+struct Diagonal2Dense {};
+
+template<> struct AssignmentKind<DenseShape,DiagonalShape> { typedef Diagonal2Dense Kind; };
+
+// Diagonal matrix to Dense assignment
+template< typename DstXprType, typename SrcXprType, typename Functor, typename Scalar>
+struct Assignment<DstXprType, SrcXprType, Functor, Diagonal2Dense, Scalar>
+{
+  static void run(DstXprType &dst, const SrcXprType &src, const internal::assign_op<typename DstXprType::Scalar> &/*func*/)
+  {
+    dst.setZero();
+    dst.diagonal() = src.diagonal();
+  }
+};
+
 } // namespace internal
 #endif // EIGEN_ENABLE_EVALUATORS
 
-- 
cgit v1.2.3