Merge pull request #1164 from mgorny/msvc-complex

Implement MSVC complex types

Author: langou

LAPACKE/include/lapack.h

@@ -47,8 +47,12 @@
 #else
 #include <complex>
 #endif
+#if _MSC_VER
+#define lapack_complex_float    _Fcomplex
+#else
 #define lapack_complex_float    float _Complex
 #endif
+#endif
 
 #ifndef lapack_complex_float_real
 #define lapack_complex_float_real(z)       (creal(z))
@@ -65,8 +69,12 @@
 #else
 #include <complex>
 #endif
+#if _MSC_VER
+#define lapack_complex_double   _Dcomplex
+#else
 #define lapack_complex_double   double _Complex
 #endif
+#endif
 
 #ifndef lapack_complex_double_real
 #define lapack_complex_double_real(z)      (creal(z))

LAPACKE/include/lapacke_config.h

@@ -99,6 +99,16 @@ typedef struct { double real, imag; } _lapack_complex_double;
 #define lapack_complex_double_real(z)       ((z).real())
 #define lapack_complex_double_imag(z)       ((z).imag())
 
+#elif _MSC_VER
+
+#include <complex.h>
+#define lapack_complex_float    _Fcomplex
+#define lapack_complex_double   _Dcomplex
+#define lapack_complex_float_real(z)       (crealf(z))
+#define lapack_complex_float_imag(z)       (cimagf(z))
+#define lapack_complex_double_real(z)       (creal(z))
+#define lapack_complex_double_imag(z)       (cimag(z))
+
 #else
 
 #include <complex.h>

LAPACKE/utils/lapacke_make_complex_double.c

@@ -43,6 +43,8 @@ lapack_complex_double lapack_make_complex_double( double re, double im ) {
     z = re + im * I;
 #elif defined(LAPACK_COMPLEX_CPP)
     z = std::complex<double>(re,im);
+#elif _MSC_VER
+    z = _Cbuild(re, im);
 #else /* C99 is default */
     z = re + im*I;
 #endif

LAPACKE/utils/lapacke_make_complex_float.c

@@ -43,6 +43,8 @@ lapack_complex_float lapack_make_complex_float( float re, float im ) {
     z = re + im * I;
 #elif defined(LAPACK_COMPLEX_CPP)
     z = std::complex<float>(re,im);
+#elif _MSC_VER
+    z = _FCbuild(re, im);
 #else /* C99 is default */
     z = re + im*I;
 #endif