Fix complex support.

And enable complex tests. Fixes #6.
devinamatthews · Jul 3, 2017 · cb3ba61 · cb3ba61
2 parents 237c870 + 6723710
commit cb3ba61
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/util/basic_types.h b/src/util/basic_types.h
@@ -168,7 +168,6 @@ namespace matrix_constants
 
 typedef struct tblis_scalar
 {
-    type_t type;
     union scalar
     {
         float s;
@@ -188,14 +187,15 @@ typedef struct tblis_scalar
         scalar(dcomplex v) : z(v) {}
 #endif
     } data;
+    type_t type;
 
 #if defined(__cplusplus) && !defined(TBLIS_DONT_USE_CXX11)
 
-    tblis_scalar() : type(TYPE_DOUBLE), data(1.0) {}
+    tblis_scalar() : data(1.0), type(TYPE_DOUBLE) {}
 
     template <typename T>
     tblis_scalar(T value)
-    : type(type_tag<T>::value), data(value) {}
+    : data(value), type(type_tag<T>::value) {}
 
     template <typename T>
     T& get();