From 65c4cd713959a47faf74ec37eab3d4613a73cb2e Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Tue, 26 Jul 2016 11:28:25 +0200 Subject: [PATCH] [fix] These aliases need explicit namespace specifier with e.g. gcc5 --- dumux/discretization/box/fvelementgeometry.hh | 4 ++-- .../discretization/cellcentered/tpfa/fvelementgeometry.hh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dumux/discretization/box/fvelementgeometry.hh b/dumux/discretization/box/fvelementgeometry.hh index a2027f0d23..71663e867d 100644 --- a/dumux/discretization/box/fvelementgeometry.hh +++ b/dumux/discretization/box/fvelementgeometry.hh @@ -72,8 +72,8 @@ class BoxFVElementGeometry<TypeTag, true> using FeLocalBasis = typename FeCache::FiniteElementType::Traits::LocalBasisType; using ReferenceElements = typename Dune::ReferenceElements<CoordScalar, dim>; - using ScvIterator = ScvIterator<SubControlVolume, std::vector<IndexType>, ThisType>; - using ScvfIterator = ScvfIterator<SubControlVolumeFace, std::vector<IndexType>, ThisType>; + using ScvIterator = Dumux::ScvIterator<SubControlVolume, std::vector<IndexType>, ThisType>; + using ScvfIterator = Dumux::ScvfIterator<SubControlVolumeFace, std::vector<IndexType>, ThisType>; public: //! Constructor diff --git a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh index 34fa21a88f..1fa9df1f21 100644 --- a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh +++ b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh @@ -60,8 +60,8 @@ class CCTpfaFVElementGeometry<TypeTag, true> using Element = typename GridView::template Codim<0>::Entity; using GlobalFVGeometry = typename GET_PROP_TYPE(TypeTag, GlobalFVGeometry); - using ScvIterator = ScvIterator<SubControlVolume, std::vector<IndexType>, ThisType>; - using ScvfIterator = ScvfIterator<SubControlVolumeFace, std::vector<IndexType>, ThisType>; + using ScvIterator = Dumux::ScvIterator<SubControlVolume, std::vector<IndexType>, ThisType>; + using ScvfIterator = Dumux::ScvfIterator<SubControlVolumeFace, std::vector<IndexType>, ThisType>; public: //! Constructor @@ -157,8 +157,8 @@ class CCTpfaFVElementGeometry<TypeTag, false> using Element = typename GridView::template Codim<0>::Entity; using GlobalFVGeometry = typename GET_PROP_TYPE(TypeTag, GlobalFVGeometry); - using ScvIterator = ScvIterator<SubControlVolume, std::vector<IndexType>, ThisType>; - using ScvfIterator = ScvfIterator<SubControlVolumeFace, std::vector<IndexType>, ThisType>; + using ScvIterator = Dumux::ScvIterator<SubControlVolume, std::vector<IndexType>, ThisType>; + using ScvfIterator = Dumux::ScvfIterator<SubControlVolumeFace, std::vector<IndexType>, ThisType>; public: //! Constructor -- GitLab