From a51806993b1a437af308db9c6893cab71e7ca814 Mon Sep 17 00:00:00 2001 From: Desire NUENTSA Date: Fri, 3 Aug 2012 16:43:12 +0200 Subject: [PATCH] Prefix with glu, the global structure --- Eigen/src/SparseLU/SparseLU_column_bmod.h | 2 +- Eigen/src/SparseLU/SparseLU_column_dfs.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Eigen/src/SparseLU/SparseLU_column_bmod.h b/Eigen/src/SparseLU/SparseLU_column_bmod.h index d4488e57f..bf25a33fc 100644 --- a/Eigen/src/SparseLU/SparseLU_column_bmod.h +++ b/Eigen/src/SparseLU/SparseLU_column_bmod.h @@ -117,7 +117,7 @@ int LU_column_bmod(const int jcol, const int nseg, BlockScalarVector& dense, Sca new_next = nextlu + glu.xlsub(fsupc + 1) - glu.xlsub(fsupc); while (new_next > glu.nzlumax ) { - mem = LUMemXpand(glu.glu.lusup, glu.nzlumax, nextlu, LUSUP, glu.num_expansions); + mem = LUMemXpand(glu.lusup, glu.nzlumax, nextlu, LUSUP, glu.num_expansions); if (mem) return mem; } diff --git a/Eigen/src/SparseLU/SparseLU_column_dfs.h b/Eigen/src/SparseLU/SparseLU_column_dfs.h index d01b84dc4..568e0686c 100644 --- a/Eigen/src/SparseLU/SparseLU_column_dfs.h +++ b/Eigen/src/SparseLU/SparseLU_column_dfs.h @@ -67,10 +67,10 @@ struct LU_column_dfs_traits { return true; } - void mem_expand(IndexVector& glu.lsub, int& nextl, int chmark) + void mem_expand(IndexVector& lsub, int& nextl, int chmark) { if (nextl >= m_glu.nzlmax) - LUMemXpand(glu.lsub, m_glu.nzlmax, nextl, LSUB, m_glu.num_expansions); + LUMemXpand(lsub, m_glu.nzlmax, nextl, LSUB, m_glu.num_expansions); if (chmark != (m_jcol-1)) m_jsuper_ref = IND_EMPTY; } enum { ExpandMem = true }; @@ -84,7 +84,7 @@ template & glu) { typedef typename IndexVector::Scalar Index; - typedef typename ScalarVector + typedef typename ScalarVector::Scalar Scalar; int jsuper = glu.supno(jcol); int nextl = glu.xlsub(jcol);