Skip to content
Snippets Groups Projects
Commit b1d8eb51 authored by Christoph Grüninger's avatar Christoph Grüninger
Browse files

[cleanup] Use std::remove_const instead of the one from Dune

parent 086dbcfb
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,7 @@
#define DUNE_ALU3DGRIDENTITY_HH
// System includes
#include <type_traits>
// Dune includes
#include <dune/grid/common/entity.hh>
......@@ -185,8 +186,8 @@ template<int dim, class GridImp>
class ALU3dGridEntity<0,dim,GridImp>
: public EntityDefaultImplementation<0,dim,GridImp,ALU3dGridEntity>
{
static const int dimworld = remove_const< GridImp >::type::dimensionworld;
static const ALU3dGridElementType elementType = remove_const< GridImp >::type::elementType;
static const int dimworld = std::remove_const< GridImp >::type::dimensionworld;
static const ALU3dGridElementType elementType = std::remove_const< GridImp >::type::elementType;
typedef typename GridImp::MPICommunicatorType Comm;
......
#ifndef DUNE_ALUGRID_3D_GRIDVIEW_HH
#define DUNE_ALUGRID_3D_GRIDVIEW_HH
#include <type_traits>
#include <dune/common/typetraits.hh>
#include <dune/common/exceptions.hh>
......@@ -23,7 +25,7 @@ namespace Dune
typedef ALU3dLevelGridView< GridImp, pitype > GridViewImp;
/** \brief type of the grid */
typedef typename remove_const<GridImp>::type Grid;
typedef typename std::remove_const<GridImp>::type Grid;
/** \brief type of the index set */
typedef typename Grid :: Traits :: LevelIndexSet IndexSet;
......@@ -216,7 +218,7 @@ namespace Dune
typedef ALU3dLeafGridView< GridImp, pitype > GridViewImp;
/** \brief type of the grid */
typedef typename remove_const<GridImp>::type Grid;
typedef typename std::remove_const<GridImp>::type Grid;
/** \brief type of the index set */
typedef typename Grid :: Traits :: LeafIndexSet IndexSet;
......
#ifndef DUNE_DEFAULTINDEXSETS_HH
#define DUNE_DEFAULTINDEXSETS_HH
#ifndef DUNE_ALUGRID_DEFAULTINDEXSETS_HH
#define DUNE_ALUGRID_DEFAULTINDEXSETS_HH
#include <type_traits>
#include <vector>
#include <rpc/rpc.h>
......@@ -233,11 +234,11 @@ namespace Dune
//! return subIndex (LevelIndex) for a given Entity of codim = 0 and a
//! given SubEntity codim and number of SubEntity
template< int cc >
IndexType subIndex ( const typename remove_const< GridImp >::type::Traits::template Codim< cc >::Entity &e,
IndexType subIndex ( const typename std::remove_const< GridImp >::type::Traits::template Codim< cc >::Entity &e,
int i, unsigned int codim ) const
{
alugrid_assert ( (codim != 0) || (level_ < 0) || ( level_ == e.level() ) );
typedef typename remove_const< GridImp >::type::Traits::template Codim< cc >::Entity Entity;
typedef typename std::remove_const< GridImp >::type::Traits::template Codim< cc >::Entity Entity;
return EntitySpec< Entity, cc >::subIndex( indexContainer( codim ), e, i );
}
......@@ -345,4 +346,4 @@ namespace Dune
} // namespace Dune
#endif // #ifndef DUNE_DEFAULTINDEXSETS_HH
#endif // #ifndef DUNE_ALUGRID_DEFAULTINDEXSETS_HH
// -*- tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
// vi: set et ts=8 sw=2 sts=2:
#ifndef DUNE_MACROGRIDVIEW_HH
#define DUNE_MACROGRIDVIEW_HH
#ifndef DUNE_ALUGRID_MACROGRIDVIEW_HH
#define DUNE_ALUGRID_MACROGRIDVIEW_HH
#include <type_traits>
#include <dune/common/typetraits.hh>
#include <dune/common/exceptions.hh>
......@@ -21,7 +23,7 @@ namespace Dune
typedef MacroGridView< GridImp, pitype > GridViewImp;
/** \brief type of the grid */
typedef typename remove_const<GridImp>::type Grid;
typedef typename std::remove_const<GridImp>::type Grid;
/** \brief type of the index set */
typedef typename Grid :: Traits :: LevelIndexSet IndexSet;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment