patched Eigen 3.2.2 for compile problem on VS2010

biospi · Dec 8, 2014 · 082a93a · 082a93a
1 parent 1a71b35
commit 082a93a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/eigen-3.2.2/Eigen/src/SparseCore/SparseDenseProduct.h b/eigen-3.2.2/Eigen/src/SparseCore/SparseDenseProduct.h
@@ -306,14 +306,14 @@ class DenseTimeSparseProduct
     DenseTimeSparseProduct& operator=(const DenseTimeSparseProduct&);
 };
 
-// sparse * dense
+/*// sparse * dense
 template<typename Derived>
 template<typename OtherDerived>
 inline const typename SparseDenseProductReturnType<Derived,OtherDerived>::Type
 SparseMatrixBase<Derived>::operator*(const MatrixBase<OtherDerived> &other) const
 {
   return typename SparseDenseProductReturnType<Derived,OtherDerived>::Type(derived(), other.derived());
-}
+}*/
 
 } // end namespace Eigen
 

diff --git a/eigen-3.2.2/Eigen/src/SparseCore/SparseMatrixBase.h b/eigen-3.2.2/Eigen/src/SparseCore/SparseMatrixBase.h
@@ -358,8 +358,10 @@ template<typename Derived> class SparseMatrixBase : public EigenBase<Derived>
     /** sparse * dense (returns a dense object unless it is an outer product) */
     template<typename OtherDerived>
     const typename SparseDenseProductReturnType<Derived,OtherDerived>::Type
-    operator*(const MatrixBase<OtherDerived> &other) const;
-
+    //operator*(const MatrixBase<OtherDerived> &other) const;
+    operator*(const MatrixBase<OtherDerived> &other) const
+    { return typename SparseDenseProductReturnType<Derived,OtherDerived>::Type(derived(), other.derived()); }
+
      /** \returns an expression of P H P^-1 where H is the matrix represented by \c *this */
     SparseSymmetricPermutationProduct<Derived,Upper|Lower> twistedBy(const PermutationMatrix<Dynamic,Dynamic,Index>& perm) const
     {