Commit d4c7e9d7 authored by Robert K's avatar Robert K
Browse files

[IdGrid] maek compile again.

parent 95cb7c68
......@@ -19,7 +19,7 @@ namespace Dune
typedef IdGridAdaptDataHandle< Grid, WrappedHandle > This;
typedef typename remove_const< Grid >::type::Traits Traits;
typedef typename Traits :: ExtraDataType ExtraData;
typedef typename Traits :: ExtraData ExtraData;
typedef typename Traits::HostGrid::template Codim< 0 >::Entity HostEntity;
......
......@@ -61,13 +61,13 @@ namespace Dune
// IdGridDataHandle
// ----------------
template< class WrappedHandle, class Grid >
template< class Grid, class WrappedHandle >
class IdGridDataHandle
: public IdGridDataHandleBase< WrappedHandle >,
public CommDataHandleIF< IdGridDataHandle< WrappedHandle, Grid >, typename WrappedHandle::DataType >
public CommDataHandleIF< IdGridDataHandle< Grid, WrappedHandle >, typename WrappedHandle::DataType >
{
protected:
typedef IdGridDataHandle< WrappedHandle, Grid > This;
typedef IdGridDataHandle< Grid, WrappedHandle > This;
typedef IdGridDataHandleBase< WrappedHandle > Base;
using Base :: wrappedHandle_ ;
......@@ -75,7 +75,7 @@ namespace Dune
// type of traits
typedef typename remove_const< Grid >::type::Traits Traits;
typedef typename Traits :: ExtraDataType ExtraData ;
typedef typename Traits :: ExtraData ExtraData ;
template< int codim >
struct Codim
......
......@@ -66,7 +66,7 @@ namespace Dune
typedef typename Traits::HostGrid HostGrid;
// type of extra data, e.g. a pointer to grid (here empty)
typedef typename Traits::ExtraDataType ExtraData;
typedef typename Traits::ExtraData ExtraData;
public:
/** \name Host Types
......@@ -175,7 +175,7 @@ namespace Dune
typedef typename Traits::HostGrid HostGrid;
// type of extra data, e.g. a pointer to grid (here empty)
typedef typename Traits::ExtraDataType ExtraData;
typedef typename Traits::ExtraData ExtraData;
public:
using Base :: codimension ;
......
......@@ -32,7 +32,7 @@ namespace Dune
protected:
typedef typename Traits::HostGrid::template Codim< codimension >::EntityPointer HostEntityPointer;
typedef typename Traits::ExtraDataType ExtraData;
typedef typename Traits::ExtraData ExtraData;
typedef typename Traits::template Codim< codimension > :: EntityImpl EntityImpl;
......
......@@ -143,7 +143,7 @@ namespace Dune
CommunicationDirection direction ) const
{
typedef CommDataHandleIF< DataHandle, Data > DataHandleIF;
typedef IdGridDataHandle< DataHandleIF, Grid > WrappedDataHandle;
typedef IdGridDataHandle< Grid, DataHandleIF > WrappedDataHandle;
WrappedDataHandle wrappedDataHandle( grid().extraData(), dataHandle );
hostGridView().communicate( wrappedDataHandle, interface, direction );
......
......@@ -19,7 +19,7 @@ namespace Dune
protected:
typedef typename remove_const< Grid >::type::Traits Traits;
typedef typename Traits :: ExtraDataType ExtraData ;
typedef typename Traits :: ExtraData ExtraData ;
typedef typename Traits::template Codim< 0 >::EntityPointerImpl EntityPointerImpl;
public:
typedef typename Traits::ctype ctype;
......
......@@ -27,7 +27,7 @@ namespace Dune
typename Traits :: LevelIntersection > :: type Intersection ;
typedef typename Intersection :: Implementation IntersectionImpl ;
typedef typename Traits :: ExtraDataType ExtraData;
typedef typename Traits :: ExtraData ExtraData;
typedef typename Grid::template Codim< 0 >::EntityPointer EntityPointer;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment