Workaround: Temporarily define ConstraintMatrix in this header

diff --git a/include/deal.II/lac/affine_constraints.h b/include/deal.II/lac/affine_constraints.h
index aaf1249c0529ebca5ed947c3ece7dafc72fe6e05..60e4e55f0c411bdf0dd058159e27d653a7c0739f 100644 (file)
--- 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 <typename number>
+class AffineConstraints;
+
+/**
+ * ConstraintMatrix has been renamed to AffineConstraints. Provide a
+ * compatibility typedef that defaults to AffineConstraints<double>.
+ *
+ * @deprecated Use AffineConstraints
+ */
+using ConstraintMatrix = AffineConstraints<double>;
+
+
 // TODO[WB]: We should have a function of the kind
 //   AffineConstraints::add_constraint (const size_type constrained_dof,
 //     const std::vector<std::pair<size_type, number> > &entries,

diff --git a/include/deal.II/lac/constraint_matrix.h b/include/deal.II/lac/constraint_matrix.h
index 64b264b8ada03fb80e04b5ae993d920b5cdcbb00..bf5f6eb3ed4c1e2b3af961c940964acb3edb7225 100644 (file)
--- a/include/deal.II/lac/constraint_matrix.h
+++ b/include/deal.II/lac/constraint_matrix.h
@@ -19,16 +19,4 @@
 
 #include <deal.II/lac/affine_constraints.h>
 
-DEAL_II_NAMESPACE_OPEN
-
-/**
- * ConstraintMatrix has been renamed to AffineConstraints. Provide a
- * compatibility typedef that defaults to AffineConstraints<double>.
- *
- * @deprecated Use AffineConstraints
- */
-using ConstraintMatrix = AffineConstraints<double>;
-
-DEAL_II_NAMESPACE_CLOSE
-
 #endif