diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-06-24 17:24:32 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-06-24 17:24:32 +0200 |
| commit | 4cc937794117a27c7a1d2643fdadd242dc83359a (patch) | |
| tree | 4a26c88a61d5333cb1a52ae3c624eff8468e5f33 /Eigen/src/CholmodSupport | |
| parent | ee8a28fb853d5bbf47bffb7e4c1adaabfe76d96c (diff) | |
fix casting from double* to void* in SuperLU and Cholmod support
Diffstat (limited to 'Eigen/src/CholmodSupport')
| -rw-r--r-- | Eigen/src/CholmodSupport/CholmodSupport.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Eigen/src/CholmodSupport/CholmodSupport.h b/Eigen/src/CholmodSupport/CholmodSupport.h index d4008e63d..783324b0b 100644 --- a/Eigen/src/CholmodSupport/CholmodSupport.h +++ b/Eigen/src/CholmodSupport/CholmodSupport.h @@ -126,7 +126,7 @@ cholmod_dense viewAsCholmod(MatrixBase<Derived>& mat) res.ncol = mat.cols(); res.nzmax = res.nrow * res.ncol; res.d = Derived::IsVectorAtCompileTime ? mat.derived().size() : mat.derived().outerStride(); - res.x = mat.derived().data(); + res.x = (void*)(mat.derived().data()); res.z = 0; internal::cholmod_configure_matrix<Scalar>(res); @@ -295,7 +295,8 @@ class CholmodBase : internal::noncopyable eigen_assert(size==b.rows()); // note: cd stands for Cholmod Dense - cholmod_dense b_cd = viewAsCholmod(b.const_cast_derived()); + Rhs& b_ref(b.const_cast_derived()); + cholmod_dense b_cd = viewAsCholmod(b_ref); cholmod_dense* x_cd = cholmod_solve(CHOLMOD_A, m_cholmodFactor, &b_cd, &m_cholmod); if(!x_cd) { @@ -345,7 +346,7 @@ class CholmodBase : internal::noncopyable } template<typename Stream> - void dumpMemory(Stream& s) + void dumpMemory(Stream& /*s*/) {} protected: |