From ade4802760ba420ee54a7a520dbfa8a1411c9756 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Fri, 2 Dec 2022 20:35:10 +0100
Subject: [PATCH] [cleanup] Removed deprecated MultyTypeBlock*::size()
---
CHANGELOG.md | 2 ++
dune/istl/multitypeblockmatrix.hh | 11 -----------
dune/istl/multitypeblockvector.hh | 12 ------------
3 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71ef83380..15214684a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,8 @@ SPDX-License-Identifier: LicenseRef-GPL-2.0-only-with-DUNE-exception
- Removed deprecated function `initSolverFactories()`, use `initSolverFactories<O>` instead.
+- Removed deprecated `MultyTypeBlock*::size()`, use `N()` instead.
+
# Release 2.9
diff --git a/dune/istl/multitypeblockmatrix.hh b/dune/istl/multitypeblockmatrix.hh
index 7621257e1..57f73b2c7 100644
--- a/dune/istl/multitypeblockmatrix.hh
+++ b/dune/istl/multitypeblockmatrix.hh
@@ -66,17 +66,6 @@ namespace Dune {
return 1+sizeof...(Args);
}
- /** \brief Return the number of matrix rows
- *
- * \deprecated Use method <code>N</code> instead.
- * This will be removed after Dune 2.8.
- */
- [[deprecated("Use method 'N' instead")]]
- static constexpr size_type size()
- {
- return 1+sizeof...(Args);
- }
-
/** \brief Return the number of matrix columns */
static constexpr size_type M()
{
diff --git a/dune/istl/multitypeblockvector.hh b/dune/istl/multitypeblockvector.hh
index fa770dbcf..5f1a3b24e 100644
--- a/dune/istl/multitypeblockvector.hh
+++ b/dune/istl/multitypeblockvector.hh
@@ -104,18 +104,6 @@ namespace Dune {
return sizeof...(Args);
}
- /**
- * number of elements
- *
- * \deprecated Use method <code>N</code> instead.
- * This will be removed after Dune 2.8.
- */
- [[deprecated("Use method 'N' instead")]]
- int count() const
- {
- return sizeof...(Args);
- }
-
/** \brief Number of scalar elements */
size_type dim() const
{
--
GitLab