From 365ebc60cdfdf73afd56d422b59457a7e2591317 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Thu, 22 Jan 2015 18:06:15 -0600
Subject: [PATCH] Remove deprecated typedef CompressedBlockSparsityPattern.

---
 doc/news/changes.h                           |  1 +
 include/deal.II/lac/block_sparsity_pattern.h | 14 --------------
 include/deal.II/lac/generic_linear_algebra.h |  4 ++--
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/doc/news/changes.h b/doc/news/changes.h
index faee6e9b10..0870c44673 100644
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -153,6 +153,7 @@ inconvenience this causes.
   - SparsityPattern and ChunkSparsityPattern functions that take an
     <code>optimize_diagonal</code> argument.
   - Mapping::transform_covariant and Mapping::transform_contravariant.
+  - The typedef CompressedBlockSparsityPattern.
   <br>
   This release also removes the deprecated class MGDoFHandler. The
   functionality of this class had previously been incorporated into
diff --git a/include/deal.II/lac/block_sparsity_pattern.h b/include/deal.II/lac/block_sparsity_pattern.h
index 4b9447669f..27c6477f08 100644
--- a/include/deal.II/lac/block_sparsity_pattern.h
+++ b/include/deal.II/lac/block_sparsity_pattern.h
@@ -488,9 +488,6 @@ public:
  * @ref Sparsity,
  * section 'Dynamic block sparsity patterns' for more information.
  *
- * <b>Note:</b> This class used to be called CompressedBlockSparsityPattern.
- * However, since it's a block wrapper around the CompressedSparsityPattern
- * class, this is a misnomer and the class has been renamed.
  *
  * <h3>Example</h3>
  *
@@ -580,17 +577,6 @@ public:
 };
 
 
-/**
- * A typdef to preserve the old name CompressedBlockSparsityPattern even after
- * we changed the naming of the class to BlockCompressedSparsityPattern. The
- * old name is now deprecated and user codes should use the name
- * BlockCompressedSparsityPattern instead.
- *
- * @deprecated
- */
-typedef BlockCompressedSparsityPattern CompressedBlockSparsityPattern DEAL_II_DEPRECATED;
-
-
 
 /**
  * This class extends the base class to implement an array of compressed
diff --git a/include/deal.II/lac/generic_linear_algebra.h b/include/deal.II/lac/generic_linear_algebra.h
index 13ca2eddc1..25a5ba0648 100644
--- a/include/deal.II/lac/generic_linear_algebra.h
+++ b/include/deal.II/lac/generic_linear_algebra.h
@@ -91,7 +91,7 @@ namespace LinearAlgebraPETSc
      */
     typedef PETScWrappers::MPI::BlockSparseMatrix BlockSparseMatrix;
 
-    typedef dealii::BlockCompressedSimpleSparsityPattern CompressedBlockSparsityPattern;
+    typedef dealii::BlockCompressedSimpleSparsityPattern BlockCompressedSparsityPattern;
 
     /**
      * Typedef for the AMG preconditioner type.
@@ -172,7 +172,7 @@ namespace LinearAlgebraTrilinos
      */
     typedef TrilinosWrappers::BlockSparseMatrix BlockSparseMatrix;
 
-    typedef TrilinosWrappers::BlockSparsityPattern CompressedBlockSparsityPattern;
+    typedef TrilinosWrappers::BlockSparsityPattern BlockCompressedSparsityPattern;
 
     /**
      * Typedef for the AMG preconditioner type.
-- 
2.39.5