From 204ac2d1e65fa77fbe2e9cc914d6f30814466464 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sat, 26 May 2018 01:59:12 -0500 Subject: [PATCH] Workaround: Temporarily define ConstraintMatrix in this header --- include/deal.II/lac/affine_constraints.h | 13 +++++++++++++ include/deal.II/lac/constraint_matrix.h | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/deal.II/lac/affine_constraints.h b/include/deal.II/lac/affine_constraints.h index aaf1249c05..60e4e55f0c 100644 --- a/include/deal.II/lac/affine_constraints.h +++ b/include/deal.II/lac/affine_constraints.h @@ -52,6 +52,19 @@ namespace internals class GlobalRowsFromLocal; } + +template +class AffineConstraints; + +/** + * ConstraintMatrix has been renamed to AffineConstraints. Provide a + * compatibility typedef that defaults to AffineConstraints. + * + * @deprecated Use AffineConstraints + */ +using ConstraintMatrix = AffineConstraints; + + // TODO[WB]: We should have a function of the kind // AffineConstraints::add_constraint (const size_type constrained_dof, // const std::vector > &entries, diff --git a/include/deal.II/lac/constraint_matrix.h b/include/deal.II/lac/constraint_matrix.h index 64b264b8ad..bf5f6eb3ed 100644 --- a/include/deal.II/lac/constraint_matrix.h +++ b/include/deal.II/lac/constraint_matrix.h @@ -19,16 +19,4 @@ #include -DEAL_II_NAMESPACE_OPEN - -/** - * ConstraintMatrix has been renamed to AffineConstraints. Provide a - * compatibility typedef that defaults to AffineConstraints. - * - * @deprecated Use AffineConstraints - */ -using ConstraintMatrix = AffineConstraints; - -DEAL_II_NAMESPACE_CLOSE - #endif -- 2.39.5