From f712a591b5d68cd53bade846c59bf6780b82ffef Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Mon, 19 Feb 2018 11:28:21 +0100
Subject: [PATCH] Abbreviate typedefs
---
dune/subgrid/subgrid/subgridindexstorage.hh | 33 ++++++++++-----------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/dune/subgrid/subgrid/subgridindexstorage.hh b/dune/subgrid/subgrid/subgridindexstorage.hh
index f80402d..c9993fe 100644
--- a/dune/subgrid/subgrid/subgridindexstorage.hh
+++ b/dune/subgrid/subgrid/subgridindexstorage.hh
@@ -596,9 +596,9 @@ class SubGridMapIndexStorage :
using GridEntity = typename Base::template GridEntity<codim>;
public:
- typedef typename std::remove_const<GridType>::type::HostGridType HostGridType;
- typedef typename HostGridType::Traits::GlobalIdSet HostIdSet;
- typedef typename HostIdSet::IdType HostIdType;
+ using HostGridType = typename Base::HostGridType;
+ using HostIdSet = typename Base::HostIdSet;
+ using HostIdType = typename Base::HostIdType;
//! \todo Please doc me !
typedef typename std::map<HostIdType, SubGridMultilevelIndex> GlobalToIndexMap;
@@ -765,11 +765,11 @@ class SubGridMapIndexStorage :
protected:
- using SubGridIndexStorageBase<GridType>::grid;
- using SubGridIndexStorageBase<GridType>::hostgrid;
- using SubGridIndexStorageBase<GridType>::numEntities;
- using SubGridIndexStorageBase<GridType>::levelTypes;
- using SubGridIndexStorageBase<GridType>::leafTypes;
+ using Base::grid;
+ using Base::hostgrid;
+ using Base::numEntities;
+ using Base::levelTypes;
+ using Base::leafTypes;
//data members, protected since helper class SubGridMapSubindexSetter need access
@@ -976,10 +976,9 @@ class SubGridVectorIndexStorage :
using GridEntity = typename Base::template GridEntity<codim>;
public:
- typedef typename std::remove_const<GridType>::type::HostGridType HostGridType;
- typedef typename HostGridType::Traits::GlobalIdSet HostIdSet;
- typedef typename HostIdSet::IdType HostIdType;
-
+ using HostGridType = typename Base::HostGridType;
+ using HostIdSet = typename Base::HostIdSet;
+ using HostIdType = typename Base::HostIdType;
//! \todo Please doc me !
typedef typename std::vector<std::vector<int> > EntityToIndex;
@@ -1278,11 +1277,11 @@ class SubGridVectorIndexStorage :
protected:
- using SubGridIndexStorageBase<GridType>::grid;
- using SubGridIndexStorageBase<GridType>::hostgrid;
- using SubGridIndexStorageBase<GridType>::numEntities;
- using SubGridIndexStorageBase<GridType>::levelTypes;
- using SubGridIndexStorageBase<GridType>::leafTypes;
+ using Base::grid;
+ using Base::hostgrid;
+ using Base::numEntities;
+ using Base::levelTypes;
+ using Base::leafTypes;
//data members, protected since helper class SubGridVectorSubindexSetter need access
--
GitLab