From aab45abd5769240683312146541872cd71fc8a09 Mon Sep 17 00:00:00 2001 From: David Wells Date: Fri, 30 Nov 2018 11:41:24 -0500 Subject: [PATCH] Remove a redefinition of a SuiteSparse type. --- include/deal.II/lac/sparse_direct.h | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/include/deal.II/lac/sparse_direct.h b/include/deal.II/lac/sparse_direct.h index 2ceeaba60a..aa6dfc92a9 100644 --- a/include/deal.II/lac/sparse_direct.h +++ b/include/deal.II/lac/sparse_direct.h @@ -31,12 +31,22 @@ #ifdef DEAL_II_WITH_UMFPACK # include #endif -#ifndef SuiteSparse_long -# define SuiteSparse_long long int -#endif DEAL_II_NAMESPACE_OPEN +namespace types +{ + /** + * Index type for UMFPACK. SuiteSparse_long has to be used here for the + * Windows 64 build. + */ +#ifdef SuiteSparse_long + using suitesparse_index = SuiteSparse_long; +#else + using suitesparse_index = long int; +#endif +} // namespace types + /** * This class provides an interface to the sparse direct solver UMFPACK, which * is part of the SuiteSparse library (see &); /** - * The arrays in which we store the data for the solver. SuiteSparse_long - * has to be used here for Windows 64 build, if we used only long int, - * compilation would fail. + * The arrays in which we store the data for the solver. */ - std::vector Ap; - std::vector Ai; - std::vector Ax; + std::vector Ap; + std::vector Ai; + std::vector Ax; /** * Control and work arrays for the solver routines. -- 2.39.5