From 263c8d051df63ccaf94ca782192827a911b31207 Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <Ansgar.Burchardt@tu-dresden.de>
Date: Fri, 21 Jul 2017 16:42:07 +0200
Subject: [PATCH] Use explicitly `Dune::Hybrid::size`
Reference: https://gitlab.dune-project.org/core/dune-common/issues/77
---
dune/matrix-vector/algorithm.hh | 2 +-
dune/matrix-vector/test/arithmetictest.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dune/matrix-vector/algorithm.hh b/dune/matrix-vector/algorithm.hh
index b8bb947..e17bc07 100644
--- a/dune/matrix-vector/algorithm.hh
+++ b/dune/matrix-vector/algorithm.hh
@@ -18,7 +18,7 @@ template <class Range, class F,
std::enable_if_t<Dune::IsTupleOrDerived<std::decay_t<Range>>::value, int> = 0>
void sparseRangeFor(Range&& range, F&& f) {
using namespace Dune::Hybrid;
- forEach(integralRange(size(range)), [&](auto&& i) {
+ forEach(integralRange(Dune::Hybrid::size(range)), [&](auto&& i) {
f(range[i], i);
});
}
diff --git a/dune/matrix-vector/test/arithmetictest.cc b/dune/matrix-vector/test/arithmetictest.cc
index be4ef79..8b1d254 100644
--- a/dune/matrix-vector/test/arithmetictest.cc
+++ b/dune/matrix-vector/test/arithmetictest.cc
@@ -663,8 +663,8 @@ public:
multiTypeBlockMatrix_check[_1][_0] = {{16}, {15}};
multiTypeBlockMatrix_check[_1][_1] = {{14, 13}, {12, 11}};
using namespace Dune::Hybrid;
- forEach(integralRange(size(multiTypeBlockMatrix_a)), [&](auto&& i) {
- forEach(integralRange(size(multiTypeBlockMatrix_a[i])), [&](auto && j) {
+ forEach(integralRange(Dune::Hybrid::size(multiTypeBlockMatrix_a)), [&](auto&& i) {
+ forEach(integralRange(Dune::Hybrid::size(multiTypeBlockMatrix_a[i])), [&](auto && j) {
passed = passed and isCloseDune(multiTypeBlockMatrix_a[i][j],
multiTypeBlockMatrix_check[i][j]);
});
--
GitLab