]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Add proper data types to sparse_direct. 534/head
authorLukas Korous <lukas.korous@gmail.com>
Fri, 13 Feb 2015 13:39:10 +0000 (14:39 +0100)
committerLukas Korous <lukas.korous@gmail.com>
Fri, 13 Feb 2015 13:52:22 +0000 (14:52 +0100)
include/deal.II/lac/sparse_direct.h

index f0126fec85dfdeadfe07a3ad3845bc0528818aa8..e057bcddd537dd6efff55d40d3b2539e027d67a7 100644 (file)
 #include <deal.II/lac/sparse_matrix_ez.h>
 #include <deal.II/lac/block_sparse_matrix.h>
 
+#ifdef DEAL_II_WITH_UMFPACK
+#  include <umfpack.h>
+#endif
+#ifndef SuiteSparse_long
+#define SuiteSparse_long long int
+#endif
 
 DEAL_II_NAMESPACE_OPEN
 
@@ -291,9 +297,11 @@ private:
 
   /**
    * 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.
    */
-  std::vector<long int> Ap;
-  std::vector<long int> Ai;
+  std::vector<SuiteSparse_long> Ap;
+  std::vector<SuiteSparse_long> Ai;
   std::vector<double> Ax;
 
   /**

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.