From daa3bb19077f407990ea011c108a6bce88ec3a48 Mon Sep 17 00:00:00 2001
From: Daniel Arndt <arndtd@ornl.gov>
Date: Sun, 5 Jul 2020 12:18:57 -0400
Subject: [PATCH] Remove deprecated TransposeTableIterators

---
 include/deal.II/base/table.h              | 30 -----------------------
 tests/base/transpose_table_iterators_0.cc | 22 +++++++++++------
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/include/deal.II/base/table.h b/include/deal.II/base/table.h
index ebbd0941e5..20c3636702 100644
--- a/include/deal.II/base/table.h
+++ b/include/deal.II/base/table.h
@@ -1878,36 +1878,6 @@ public:
 };
 
 
-/**
- * A namespace for iterators for TransposeTable. TransposeTable is unique in
- * that it stores entries in column-major order.
- *
- * @warning The classes defined in this namespace have been deprecated in
- * favor of the more general versions in MatrixTableIterators. Use those
- * instead.
- */
-namespace TransposeTableIterators
-{
-  template <typename T, bool Constness>
-  using AccessorBase DEAL_II_DEPRECATED = MatrixTableIterators::AccessorBase<
-    TransposeTable<T>,
-    Constness,
-    MatrixTableIterators::Storage::column_major>;
-
-  template <typename T, bool Constness>
-  using Accessor DEAL_II_DEPRECATED =
-    MatrixTableIterators::Accessor<TransposeTable<T>,
-                                   Constness,
-                                   MatrixTableIterators::Storage::column_major>;
-
-  template <typename T, bool Constness>
-  using Iterator DEAL_II_DEPRECATED =
-    MatrixTableIterators::Iterator<TransposeTable<T>,
-                                   Constness,
-                                   MatrixTableIterators::Storage::column_major>;
-} // namespace TransposeTableIterators
-
-
 /**
  * A class representing a transpose two-dimensional table, i.e. a matrix of
  * objects (not necessarily only numbers) in column first numbering (FORTRAN
diff --git a/tests/base/transpose_table_iterators_0.cc b/tests/base/transpose_table_iterators_0.cc
index fff3657ba4..58858deea2 100644
--- a/tests/base/transpose_table_iterators_0.cc
+++ b/tests/base/transpose_table_iterators_0.cc
@@ -101,13 +101,21 @@ main()
   {
     TransposeTable<double> table(2, 2);
 
-    TransposeTableIterators::Accessor<double, true>  a3(&table, 2);
-    TransposeTableIterators::Accessor<double, false> a4(&table, 2);
-    deallog
-      << "Accessors refer to the same entry: "
-      << (&(TransposeTableIterators::Accessor<double, true>(a4).value()) ==
-          &(a3.value()))
-      << std::endl;
+    MatrixTableIterators::Accessor<TransposeTable<double>,
+                                   true,
+                                   MatrixTableIterators::Storage::column_major>
+      a3(&table, 2);
+    MatrixTableIterators::Accessor<TransposeTable<double>,
+                                   false,
+                                   MatrixTableIterators::Storage::column_major>
+      a4(&table, 2);
+    deallog << "Accessors refer to the same entry: "
+            << (&(MatrixTableIterators::Accessor<
+                    TransposeTable<double>,
+                    true,
+                    MatrixTableIterators::Storage::column_major>(a4)
+                    .value()) == &(a3.value()))
+            << std::endl;
   }
 
   // test a non-empty rectangular table
-- 
2.39.5