1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
--- a/dune/istl/superlu.hh
+++ b/dune/istl/superlu.hh
@@ -187,7 +187,7 @@ namespace Dune
static void create(SuperMatrix *mat, int n, int m, std::complex<float> *dat, int n1,
Stype_t stype, Dtype_t dtype, Mtype_t mtype)
{
- cCreate_Dense_Matrix(mat, n, m, reinterpret_cast< ::complex*>(dat), n1, stype, dtype, mtype);
+ cCreate_Dense_Matrix(mat, n, m, reinterpret_cast<singlecomplex*>(dat), n1, stype, dtype, mtype);
}
--- a/dune/istl/superlufunctions.hh
+++ b/dune/istl/superlufunctions.hh
@@ -58,13 +58,6 @@ extern "C" {
#endif
#if __has_include("slu_cdefs.h")
-#ifndef SUPERLU_TYPEDEF_COMPLEX
-// Per default SuperLU >= 7.0.0. does not provide
-// a type complex anymore. By setting SUPERLU_TYPEDEF_COMPLEX
-// we tell SuperLU to define complex to be the same as the
-// new type singlecomplex
-#define SUPERLU_TYPEDEF_COMPLEX
-#endif
#include "slu_scomplex.h"
extern "C" {
@@ -77,12 +70,12 @@ extern "C" {
extern void
- cCreate_Dense_Matrix(SuperMatrix *, int, int, ::complex *, int,
+ cCreate_Dense_Matrix(SuperMatrix *, int, int, singlecomplex *, int,
Stype_t, Dtype_t, Mtype_t);
extern void
- cCreate_CompCol_Matrix(SuperMatrix *, int, int, int, ::complex *,
+ cCreate_CompCol_Matrix(SuperMatrix *, int, int, int, singlecomplex *,
int *, int *, Stype_t, Dtype_t, Mtype_t);
extern int cQuerySpace (SuperMatrix *, SuperMatrix *, mem_usage_t *);
--- a/dune/istl/supermatrix.hh
+++ b/dune/istl/supermatrix.hh
@@ -83,7 +83,7 @@ namespace Dune
std::complex<float> *values, int *rowindex, int* colindex,
Stype_t stype, Dtype_t dtype, Mtype_t mtype)
{
- cCreate_CompCol_Matrix(mat, n, m, offset, reinterpret_cast< ::complex*>(values),
+ cCreate_CompCol_Matrix(mat, n, m, offset, reinterpret_cast<singlecomplex*>(values),
rowindex, colindex, stype, dtype, mtype);
}
};
|
