1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
|
From 2c336aaa39889d4b12064d610958f701ac96f920 Mon Sep 17 00:00:00 2001
From: Markus Blatt <markus@dr-blatt.de>
Date: Tue, 18 Nov 2025 12:06:45 +0100
Subject: [PATCH] Fix compilation with Debian g++-15_15.2.0-8.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
I have no idea why the previous version should be different and breaks
compilation there
```
[ 19%] Building CXX object CMakeFiles/flow_libpolymer.dir/flow/flow_polymer.cpp.o
/usr/bin/c++ -DFMT_SHARED -DHAVE_CONFIG_H=1 -I/<<PKGBUILDDIR>>/obj-loongarch64-linux-gnu -I/<<PKGBUILDDIR>> -I/usr/lib/loongarch64-linux-gnu/openmpi/include -I/usr/lib/loongarch64-linux-gnu/openmpi/include/openmpi -I/usr/include/parmetis -I/usr/include/superlu -I/usr/include/suitesparse -I/usr/include/cjson -I/usr/include/trilinos -I/usr/include/scotch -I/usr/include/metis -I/usr/include/hdf5/openmpi -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -pipe -Wno-dangling-reference -fopenmp -pthread -std=c++17 -MD -MT CMakeFiles/flow_libpolymer.dir/flow/flow_polymer.cpp.o -MF CMakeFiles/flow_libpolymer.dir/flow/flow_polymer.cpp.o.d -o CMakeFiles/flow_libpolymer.dir/flow/flow_polymer.cpp.o -c /<<PKGBUILDDIR>>/flow/flow_polymer.cpp
In file included from /usr/include/dune/istl/paamg/smoother.hh:9,
from /<<PKGBUILDDIR>>/opm/simulators/linalg/WellOperators.hpp:33,
from /<<PKGBUILDDIR>>/opm/simulators/linalg/ISTLSolver.hpp:47,
from /<<PKGBUILDDIR>>/opm/simulators/linalg/ISTLSolverGpuBridge.hpp:25,
from /<<PKGBUILDDIR>>/opm/simulators/flow/BlackoilModelNldd.hpp:43,
from /<<PKGBUILDDIR>>/opm/simulators/flow/BlackoilModel.hpp:30,
from /<<PKGBUILDDIR>>/opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp:44,
from /<<PKGBUILDDIR>>/flow/flow_oilwater_polymer.cpp:25:
/usr/include/dune/istl/paamg/aggregates.hh:1638:26: error: ‘class Dune::Amg::Aggregate<G, S>::VertexSet’ resolves to ‘Dune::Amg::Aggregate<G, S>::VertexSet’, which is not a class type [-Wtemplate-body]
1638 | Aggregate<G,S>::size()
| ^
/usr/include/dune/istl/paamg/aggregates.hh:1645:33: error: ‘class Dune::Amg::Aggregate<G, S>::VertexSet’ resolves to ‘Dune::Amg::Aggregate<G, S>::VertexSet’, which is not a class type [-Wtemplate-body]
1645 | Aggregate<G,S>::connectSize()
| ^
```
---
dune/istl/paamg/aggregates.hh | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/dune/istl/paamg/aggregates.hh b/dune/istl/paamg/aggregates.hh
index c31f2eed..e8cd97f6 100644
--- a/dune/istl/paamg/aggregates.hh
+++ b/dune/istl/paamg/aggregates.hh
@@ -806,6 +806,11 @@ namespace Dune
*/
typedef S VertexSet;
+ /**
+ * @brief Type of size used by allocator of sllist
+ */
+ using size_type = typename VertexSet::size_type;
+
/** @brief Const iterator over a vertex list. */
typedef typename VertexSet::const_iterator const_iterator;
@@ -857,11 +862,11 @@ namespace Dune
/**
* @brief Get the size of the aggregate.
*/
- typename VertexSet::size_type size();
+ size_type size();
/**
* @brief Get the number of connections to other aggregates.
*/
- typename VertexSet::size_type connectSize();
+ size_type connectSize();
/**
* @brief Get the id identifying the aggregate.
@@ -1640,14 +1645,14 @@ namespace Dune
}
template<class G,class S>
- inline typename Aggregate<G,S>::VertexSet::size_type
+ inline typename Aggregate<G,S>::size_type
Aggregate<G,S>::size()
{
return vertices_.size();
}
template<class G,class S>
- inline typename Aggregate<G,S>::VertexSet::size_type
+ inline typename Aggregate<G,S>::size_type
Aggregate<G,S>::connectSize()
{
return connected_.size();
--
2.39.5
|