]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove deprecated TransposeTableIterators 10654/head
authorDaniel Arndt <arndtd@ornl.gov>
Sun, 5 Jul 2020 16:18:57 +0000 (12:18 -0400)
committerDaniel Arndt <arndtd@ornl.gov>
Sun, 5 Jul 2020 16:19:51 +0000 (12:19 -0400)
include/deal.II/base/table.h
tests/base/transpose_table_iterators_0.cc

index ebbd0941e5ee5501ff1e6e25e196f49549341279..20c363670297eb53f4bb04ad321db344f66f74cb 100644 (file)
@@ -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
index fff3657ba40021ff225a9ff63f756554abb19d60..58858deea25d2c83bda1dafe772b79d67b9400a1 100644 (file)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.