From: Martin Kronbichler Date: Fri, 4 Aug 2017 16:30:38 +0000 (+0200) Subject: Fix compilation with unity build. X-Git-Tag: v9.0.0-rc1~1360^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22aa66aad5eaf34734b794fbb3aeb52f5b582a0f;p=dealii.git Fix compilation with unity build. --- diff --git a/source/base/CMakeLists.txt b/source/base/CMakeLists.txt index 92f550cfef..af9cf98536 100644 --- 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 f2865134c5..711343ecf6 100644 --- a/source/lac/tridiagonal_matrix.cc +++ b/source/lac/tridiagonal_matrix.cc @@ -240,7 +240,7 @@ TridiagonalMatrix::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 number TridiagonalMatrix::eigenvalue(const size_type i) const { - Assert(state == eigenvalues, ExcState(state)); + Assert(state == LAPACKSupport::eigenvalues, ExcState(state)); Assert(i