From d2e65e6775fb13c54331fcedd81216fe6ab33a7e Mon Sep 17 00:00:00 2001
From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Sun, 17 Jun 2018 11:51:49 +0200
Subject: [PATCH] Avoid constraint_matrix.h in include/deal.II

---
 include/deal.II/lac/affine_constraints.h                    | 2 +-
 include/deal.II/matrix_free/dof_info.h                      | 2 +-
 include/deal.II/matrix_free/matrix_free.h                   | 2 +-
 include/deal.II/multigrid/mg_transfer_block.templates.h     | 2 +-
 include/deal.II/multigrid/mg_transfer_component.h           | 2 +-
 include/deal.II/multigrid/mg_transfer_component.templates.h | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/deal.II/lac/affine_constraints.h b/include/deal.II/lac/affine_constraints.h
index dd92453904..5bae87d79f 100644
--- a/include/deal.II/lac/affine_constraints.h
+++ b/include/deal.II/lac/affine_constraints.h
@@ -62,7 +62,7 @@ class AffineConstraints;
  *
  * @deprecated Use AffineConstraints<double> instead of ConstraintMatrix
  */
-using ConstraintMatrix = AffineConstraints<double>;
+using ConstraintMatrix DEAL_II_DEPRECATED = AffineConstraints<double>;
 // Note: Unfortunately, we cannot move this compatibility typedef into
 // constraint_matrix.h directly. This would break a lot of user projects
 // that include constraint_matrix.h transitively due to various deal.II
diff --git a/include/deal.II/matrix_free/dof_info.h b/include/deal.II/matrix_free/dof_info.h
index f7f2d032ae..3c558f06d0 100644
--- a/include/deal.II/matrix_free/dof_info.h
+++ b/include/deal.II/matrix_free/dof_info.h
@@ -24,7 +24,7 @@
 
 #include <deal.II/dofs/dof_handler.h>
 
-#include <deal.II/lac/constraint_matrix.h>
+#include <deal.II/lac/affine_constraints.h>
 #include <deal.II/lac/dynamic_sparsity_pattern.h>
 
 #include <deal.II/matrix_free/face_info.h>
diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h
index d8a4fd883b..dd86631b39 100644
--- a/include/deal.II/matrix_free/matrix_free.h
+++ b/include/deal.II/matrix_free/matrix_free.h
@@ -35,8 +35,8 @@
 #include <deal.II/hp/dof_handler.h>
 #include <deal.II/hp/q_collection.h>
 
+#include <deal.II/lac/affine_constraints.h>
 #include <deal.II/lac/block_vector_base.h>
-#include <deal.II/lac/constraint_matrix.h>
 #include <deal.II/lac/la_parallel_vector.h>
 #include <deal.II/lac/vector_operation.h>
 
diff --git a/include/deal.II/multigrid/mg_transfer_block.templates.h b/include/deal.II/multigrid/mg_transfer_block.templates.h
index 6514672eaa..580d1dd9f0 100644
--- a/include/deal.II/multigrid/mg_transfer_block.templates.h
+++ b/include/deal.II/multigrid/mg_transfer_block.templates.h
@@ -23,7 +23,7 @@
 
 #include <deal.II/grid/tria_iterator.h>
 
-#include <deal.II/lac/constraint_matrix.h>
+#include <deal.II/lac/affine_constraints.h>
 #include <deal.II/lac/sparse_matrix.h>
 
 #include <deal.II/multigrid/mg_base.h>
diff --git a/include/deal.II/multigrid/mg_transfer_component.h b/include/deal.II/multigrid/mg_transfer_component.h
index 73b3b5d2ab..0a6353d49f 100644
--- a/include/deal.II/multigrid/mg_transfer_component.h
+++ b/include/deal.II/multigrid/mg_transfer_component.h
@@ -24,9 +24,9 @@
 
 #include <deal.II/fe/component_mask.h>
 
+#include <deal.II/lac/affine_constraints.h>
 #include <deal.II/lac/block_sparsity_pattern.h>
 #include <deal.II/lac/block_vector.h>
-#include <deal.II/lac/constraint_matrix.h>
 #include <deal.II/lac/sparsity_pattern.h>
 #include <deal.II/lac/vector_memory.h>
 
diff --git a/include/deal.II/multigrid/mg_transfer_component.templates.h b/include/deal.II/multigrid/mg_transfer_component.templates.h
index e2a7f5270c..5871a95e7e 100644
--- a/include/deal.II/multigrid/mg_transfer_component.templates.h
+++ b/include/deal.II/multigrid/mg_transfer_component.templates.h
@@ -23,7 +23,7 @@
 
 #include <deal.II/grid/tria_iterator.h>
 
-#include <deal.II/lac/constraint_matrix.h>
+#include <deal.II/lac/affine_constraints.h>
 #include <deal.II/lac/sparse_matrix.h>
 
 #include <deal.II/multigrid/mg_base.h>
-- 
2.39.5