Patch by Gael Guennebaud, making Eigen compatible with the Intel compiler (icc).

CCMAIL:eigen@lists.tuxfamily.org

1 files changed, 5 insertions, 5 deletions

diff --git a/Eigen/src/Core/DiagonalMatrix.h b/Eigen/src/Core/DiagonalMatrix.h
index 67f10cfb7..99245b750 100644
--- a/Eigen/src/Core/DiagonalMatrix.h
+++ b/Eigen/src/Core/DiagonalMatrix.h
@@ -51,15 +51,15 @@ class DiagonalMatrix : NoOperatorEquals,
     
     DiagonalMatrix(const CoeffsVecRef& coeffs) : m_coeffs(coeffs)
     {
-      assert(CoeffsVectorType::IsVectorAtCompileTime
+      assert(CoeffsVectorType::Traits::IsVectorAtCompileTime
           && coeffs.size() > 0);
     }
     
-  private:
-    static const TraversalOrder _Order = Indifferent;
-    static const int _RowsAtCompileTime = CoeffsVectorType::SizeAtCompileTime,
-                     _ColsAtCompileTime = CoeffsVectorType::SizeAtCompileTime;
+    static const TraversalOrder Order = Indifferent;
+    static const int RowsAtCompileTime = CoeffsVectorType::Traits::SizeAtCompileTime,
+                     ColsAtCompileTime = CoeffsVectorType::Traits::SizeAtCompileTime;
 
+  private:
     const DiagonalMatrix& _ref() const { return *this; }
     int _rows() const { return m_coeffs.size(); }
     int _cols() const { return m_coeffs.size(); }