From: David Wells <drwells@email.unc.edu>
Date: Fri, 30 Nov 2018 16:41:24 +0000 (-0500)
Subject: Remove a redefinition of a SuiteSparse type.
X-Git-Tag: v9.1.0-rc1~505^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aab45abd5769240683312146541872cd71fc8a09;p=dealii.git

Remove a redefinition of a SuiteSparse type.
---

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 <umfpack.h>
 #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 <a
@@ -353,13 +363,11 @@ private:
   sort_arrays(const BlockSparseMatrix<number> &);
 
   /**
-   * 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<SuiteSparse_long> Ap;
-  std::vector<SuiteSparse_long> Ai;
-  std::vector<double>           Ax;
+  std::vector<types::suitesparse_index> Ap;
+  std::vector<types::suitesparse_index> Ai;
+  std::vector<double>                   Ax;
 
   /**
    * Control and work arrays for the solver routines.