From: Matthias Maier Date: Thu, 24 May 2018 19:27:49 +0000 (-0500) Subject: lac: remove scratch_data_initializer from constraint_matrix.cc X-Git-Tag: v9.1.0-rc1~1067^2~40 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47b829e316e20391631dfd70d36391a063c6012a;p=dealii.git lac: remove scratch_data_initializer from constraint_matrix.cc --- diff --git a/source/lac/constraint_matrix.cc b/source/lac/constraint_matrix.cc index 9ea0738e02..76c8202b4f 100644 --- a/source/lac/constraint_matrix.cc +++ b/source/lac/constraint_matrix.cc @@ -1614,29 +1614,4 @@ ONLY_MATRIX_FUNCTIONS(PETScWrappers::MPI::BlockSparseMatrix); #include "constraint_matrix.inst" -// allocate scratch data. Cannot use the generic template instantiation -// because we need to provide an initializer object of type -// internals::ConstraintMatrixData that can be passed to the -// constructor of scratch_data (it won't allow one to be constructed in place). -namespace internals -{ -#define SCRATCH_INITIALIZER(MatrixScalar, VectorScalar, Name) \ - ConstraintMatrixData::ScratchData \ - scratch_data_initializer_##Name; \ - template <> \ - Threads::ThreadLocalStorage< \ - ConstraintMatrixData::ScratchData> \ - ConstraintMatrixData::scratch_data( \ - scratch_data_initializer_##Name) - - SCRATCH_INITIALIZER(double, double, dd); - SCRATCH_INITIALIZER(float, float, ff); - SCRATCH_INITIALIZER(std::complex, std::complex, zz); - SCRATCH_INITIALIZER(std::complex, std::complex, cc); - SCRATCH_INITIALIZER(double, std::complex, dz); - SCRATCH_INITIALIZER(float, std::complex, fc); -#undef SCRATCH_INITIALIZER -} // namespace internals - - DEAL_II_NAMESPACE_CLOSE