Fix compilation with unity build.

diff --git a/source/base/CMakeLists.txt b/source/base/CMakeLists.txt
index 92f550cfeff285d9acc827e9bad09f5a5d7b29d5..af9cf9853677a78b163ff5d33888f2690d227d16 100644 (file)
--- a/source/base/CMakeLists.txt
+++ b/source/base/CMakeLists.txt
@@ -66,7 +66,6 @@ SET(_unity_include_src
   quadrature_lib.cc
   quadrature_selector.cc
   subscriptor.cc
-  symmetric_tensor.cc
   table_handler.cc
   tensor_function.cc
   tensor_product_polynomials.cc
@@ -81,6 +80,7 @@ SET(_unity_include_src
 
 SET(_separate_src
   data_out_base.cc
+  symmetric_tensor.cc
   )
 
 # determined by profiling

diff --git a/source/lac/tridiagonal_matrix.cc b/source/lac/tridiagonal_matrix.cc
index f2865134c5617c470784f36c69ab1f079233bcc4..711343ecf60e29fca183049170e0e445558796bd 100644 (file)
--- a/source/lac/tridiagonal_matrix.cc
+++ b/source/lac/tridiagonal_matrix.cc
@@ -240,7 +240,7 @@ TridiagonalMatrix<double>::compute_eigenvalues()
   stev (&N, &nn, &*diagonal.begin(), &*right.begin(), nullptr, &one, nullptr, &info);
   Assert(info == 0, ExcInternalError());
 
-  state = eigenvalues;
+  state = LAPACKSupport::eigenvalues;
 #else
   Assert(false, ExcNeedsLAPACK());
 #endif
@@ -251,7 +251,7 @@ template <typename number>
 number
 TridiagonalMatrix<number>::eigenvalue(const size_type i) const
 {
-  Assert(state == eigenvalues, ExcState(state));
+  Assert(state == LAPACKSupport::eigenvalues, ExcState(state));
   Assert(i<n(), ExcIndexRange(i,0,n()));
   return diagonal[i];
 }