Fix problem with clang 3.9 on OSX.

# Conflicts: # test/test.cxx
devinamatthews · May 19, 2017 · 6ce6fd3 · 6ce6fd3
1 parent ab7913f
commit 6ce6fd3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/util/basic_types.h b/src/util/basic_types.h
@@ -292,13 +292,13 @@ typedef struct tblis_vector
     template <typename T>
     T& alpha()
     {
-        scalar.get<T>();
+        return scalar.get<T>();
     }
 
     template <typename T>
     const T& alpha() const
     {
-        scalar.get<T>();
+        return scalar.get<T>();
     }
 
     void swap(tblis_vector& other)

diff --git a/test/test.cxx b/test/test.cxx
@@ -1255,7 +1255,7 @@ void test_dot(stride_type N)
     add(T(1.0), A, idx_A.data(), T(0.0), B, idx_B.data());
     T* data = B.data();
     MArray::viterator<> it(B.lengths(), B.strides());
-    while (it.next(data)) *data = conj(*data);
+    while (it.next(data)) *data = tblis::conj(*data);
     T ref_val = reduce(REDUCE_NORM_2, A, idx_A.data()).first;
     T calc_val = dot(A, idx_A.data(), B, idx_B.data());
     passfail("NRM2", ref_val*ref_val, calc_val, ulp_factor*ceil2(neps));