Clarify error message when writing to a read-only sparse-sub-matrix.

1 files changed, 19 insertions, 4 deletions

diff --git a/Eigen/src/SparseCore/SparseBlock.h b/Eigen/src/SparseCore/SparseBlock.h
index 43fe788d9..3a811113f 100644
--- a/Eigen/src/SparseCore/SparseBlock.h
+++ b/Eigen/src/SparseCore/SparseBlock.h
@@ -73,8 +73,15 @@ public:
     Index m_outerStart;

     const internal::variable_if_dynamic<Index, OuterSize> m_outerSize;

   

-  public:

-    EIGEN_INHERIT_ASSIGNMENT_OPERATORS(BlockImpl)

+  protected:

+    // Disable assignment with clear error message.

+    // Note that simply removing operator= yields compilation errors with ICC+MSVC

+    template<typename T>

+    BlockImpl& operator=(const T&)

+    {

+      EIGEN_STATIC_ASSERT(sizeof(T)==0, THIS_SPARSE_BLOCK_SUBEXPRESSION_IS_READ_ONLY);

+      return *this;

+    }

 };

 

 

@@ -424,8 +431,6 @@ public:
     friend struct internal::unary_evaluator<Block<XprType,BlockRows,BlockCols,InnerPanel>, internal::IteratorBased, Scalar >;

     

     Index nonZeros() const { return Dynamic; }

-    

-    EIGEN_INHERIT_ASSIGNMENT_OPERATORS(BlockImpl)

 

     typename internal::ref_selector<XprType>::non_const_type m_matrix;

     const internal::variable_if_dynamic<Index, XprType::RowsAtCompileTime == 1 ? 0 : Dynamic> m_startRow;

@@ -433,6 +438,16 @@ public:
     const internal::variable_if_dynamic<Index, RowsAtCompileTime> m_blockRows;

     const internal::variable_if_dynamic<Index, ColsAtCompileTime> m_blockCols;

 

+  protected:

+    // Disable assignment with clear error message.

+    // Note that simply removing operator= yields compilation errors with ICC+MSVC

+    template<typename T>

+    BlockImpl& operator=(const T&)

+    {

+      EIGEN_STATIC_ASSERT(sizeof(T)==0, THIS_SPARSE_BLOCK_SUBEXPRESSION_IS_READ_ONLY);

+      return *this;

+    }

+

 };

 

 namespace internal {