From 8c9e6cba785b3a44b309fafe7ea518c5d4ff786f Mon Sep 17 00:00:00 2001 From: hartmann Date: Wed, 12 Jun 2002 11:53:30 +0000 Subject: [PATCH] The constructors of all DoFAccessor, TriaAccessor and TriaIterator classes now take pointers to const Triangulations. git-svn-id: https://svn.dealii.org/trunk@6072 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/dofs/dof_accessor.h | 10 +++++----- deal.II/deal.II/include/grid/tria_accessor.h | 18 +++++++++--------- deal.II/deal.II/include/grid/tria_iterator.h | 6 +++--- .../include/grid/tria_iterator.templates.h | 6 +++--- .../include/multigrid/mg_dof_accessor.h | 10 +++++----- deal.II/deal.II/source/grid/tria_accessor.cc | 6 +++--- .../source/multigrid/mg_dof_accessor.cc | 6 +++--- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/deal.II/deal.II/include/dofs/dof_accessor.h b/deal.II/deal.II/include/dofs/dof_accessor.h index b405301814..759a25256f 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.h @@ -257,7 +257,7 @@ class DoFObjectAccessor : public DoFAccessor, * argument is assumed to be a pointer * to a @ref{DoFHandler} object. */ - DoFObjectAccessor (Triangulation *tria, + DoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data) : @@ -511,7 +511,7 @@ class DoFObjectAccessor<1, dim> : public DoFAccessor, * argument is assumed to be a pointer * to a @ref{DoFHandler} object. */ - DoFObjectAccessor (Triangulation *tria, + DoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data) : @@ -699,7 +699,7 @@ class DoFObjectAccessor<2, dim> : public DoFAccessor, * argument is assumed to be a pointer * to a @ref{DoFHandler} object. */ - DoFObjectAccessor (Triangulation *tria, + DoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data) : @@ -896,7 +896,7 @@ class DoFObjectAccessor<3, dim> : public DoFAccessor, * argument is assumed to be a pointer * to a @ref{DoFHandler} object. */ - DoFObjectAccessor (Triangulation *tria, + DoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data) : @@ -1098,7 +1098,7 @@ class DoFCellAccessor : public DoFObjectAccessor /** * Constructor */ - DoFCellAccessor (Triangulation *tria, + DoFCellAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data) : diff --git a/deal.II/deal.II/include/grid/tria_accessor.h b/deal.II/deal.II/include/grid/tria_accessor.h index c34bb178f8..08cb3ef384 100644 --- a/deal.II/deal.II/include/grid/tria_accessor.h +++ b/deal.II/deal.II/include/grid/tria_accessor.h @@ -80,7 +80,7 @@ class TriaAccessor * only callable from friend * classes. */ - TriaAccessor (Triangulation *parent = 0, + TriaAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, const AccessorData * = 0) : @@ -261,7 +261,7 @@ class TriaAccessor * Pointer to the triangulation which * we act on. */ - Triangulation *tria; + const Triangulation *tria; template friend class TriaRawIterator; template friend class TriaIterator; @@ -295,7 +295,7 @@ class TriaObjectAccessor : public TriaAccessor * By default, an illegal * accessor is constructed. */ - TriaObjectAccessor (Triangulation *parent = 0, + TriaObjectAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, const AccessorData *local_data = 0) : @@ -329,7 +329,7 @@ class TriaObjectAccessor : public TriaAccessor int vertex_index (const unsigned int i) const; /** - * Reference (not an iterator!) + * Const reference (not an iterator!) * to the @p{i}th vertex. */ Point & vertex (const unsigned int i) const; @@ -683,7 +683,7 @@ class TriaObjectAccessor<0, dim> : public TriaAccessor * Constructor. Should never be called and * thus produces an error. */ - TriaObjectAccessor (Triangulation *parent = 0, + TriaObjectAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, const AccessorData *local_data = 0) : @@ -716,7 +716,7 @@ class TriaObjectAccessor<1, dim> : public TriaAccessor /** * Constructor. */ - TriaObjectAccessor (Triangulation *parent = 0, + TriaObjectAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, const AccessorData *local_data = 0) : @@ -1059,7 +1059,7 @@ class TriaObjectAccessor<2, dim> : public TriaAccessor /** * Constructor. */ - TriaObjectAccessor (Triangulation *parent = 0, + TriaObjectAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, const AccessorData *local_data = 0) : @@ -1436,7 +1436,7 @@ class TriaObjectAccessor<3, dim> : public TriaAccessor /** * Constructor. */ - TriaObjectAccessor (Triangulation *parent = 0, + TriaObjectAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, const AccessorData *local_data = 0) : @@ -1822,7 +1822,7 @@ class CellAccessor : public TriaObjectAccessor /** * Constructor. */ - CellAccessor (Triangulation *parent = 0, + CellAccessor (const Triangulation *parent = 0, const int level = -1, const int index = -1, const AccessorData *local_data = 0) : diff --git a/deal.II/deal.II/include/grid/tria_iterator.h b/deal.II/deal.II/include/grid/tria_iterator.h index c3d1724f0d..80703d3d09 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.h +++ b/deal.II/deal.II/include/grid/tria_iterator.h @@ -285,7 +285,7 @@ class TriaRawIterator : * of a type declared by the accessor * class. */ - TriaRawIterator (Triangulation *parent, + TriaRawIterator (const Triangulation *parent, const int level, const int index, const typename AccessorType::AccessorData *local_data = 0); @@ -568,7 +568,7 @@ class TriaIterator : public TriaRawIterator * used, the debug version raises * an error! */ - TriaIterator (Triangulation *parent, + TriaIterator (const Triangulation *parent, const int level, const int index, const typename Accessor::AccessorData *local_data = 0); @@ -727,7 +727,7 @@ class TriaActiveIterator : public TriaIterator * active, the debug version raises * an error! */ - TriaActiveIterator (Triangulation *parent, + TriaActiveIterator (const Triangulation *parent, const int level, const int index, const typename Accessor::AccessorData *local_data = 0); diff --git a/deal.II/deal.II/include/grid/tria_iterator.templates.h b/deal.II/deal.II/include/grid/tria_iterator.templates.h index 67770ff130..56805b43f1 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.templates.h +++ b/deal.II/deal.II/include/grid/tria_iterator.templates.h @@ -42,7 +42,7 @@ TriaRawIterator::TriaRawIterator (const TriaRawIterator inline -TriaRawIterator::TriaRawIterator (Triangulation *parent, +TriaRawIterator::TriaRawIterator (const Triangulation *parent, const int level, const int index, const typename Accessor::AccessorData *local_data) : @@ -144,7 +144,7 @@ TriaIterator::TriaIterator (const TriaRawIterator &i template inline -TriaIterator::TriaIterator (Triangulation *parent, +TriaIterator::TriaIterator (const Triangulation *parent, const int level, const int index, const typename Accessor::AccessorData *local_data) : @@ -292,7 +292,7 @@ TriaActiveIterator::TriaActiveIterator (const TriaIterator inline -TriaActiveIterator::TriaActiveIterator (Triangulation *parent, +TriaActiveIterator::TriaActiveIterator (const Triangulation *parent, const int level, const int index, const typename Accessor::AccessorData *local_data) : diff --git a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h index 81bf9735d6..7b81045482 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h @@ -188,7 +188,7 @@ class MGDoFObjectAccessor<0, dim> * Constructor. Should never be called * and thus throws an error. */ - MGDoFObjectAccessor (Triangulation *, + MGDoFObjectAccessor (const Triangulation *, const int, const int, const AccessorData *) @@ -250,7 +250,7 @@ class MGDoFObjectAccessor<1, dim> : public MGDoFAccessor, * argument is assumed to be a pointer * to a @p{MGDoFHandler} object. */ - MGDoFObjectAccessor (Triangulation *tria, + MGDoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data); @@ -366,7 +366,7 @@ class MGDoFObjectAccessor<2, dim> : public MGDoFAccessor, * argument is assumed to be a pointer * to a @ref{DoFHandler} object. */ - MGDoFObjectAccessor (Triangulation *tria, + MGDoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data); @@ -491,7 +491,7 @@ class MGDoFObjectAccessor<3, dim> : public MGDoFAccessor, * argument is assumed to be a pointer * to a @ref{DoFHandler} object. */ - MGDoFObjectAccessor (Triangulation *tria, + MGDoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data); @@ -626,7 +626,7 @@ class MGDoFCellAccessor : public MGDoFObjectAccessor { /** * Constructor */ - MGDoFCellAccessor (Triangulation *tria, + MGDoFCellAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data) : diff --git a/deal.II/deal.II/source/grid/tria_accessor.cc b/deal.II/deal.II/source/grid/tria_accessor.cc index c40c48e360..529ff3dae2 100644 --- a/deal.II/deal.II/source/grid/tria_accessor.cc +++ b/deal.II/deal.II/source/grid/tria_accessor.cc @@ -46,7 +46,7 @@ template Point & TriaObjectAccessor<1, dim>::vertex (const unsigned int i) const { - return this->tria->vertices[vertex_index(i)]; + return const_cast &> (this->tria->vertices[vertex_index(i)]); }; @@ -247,7 +247,7 @@ template Point & TriaObjectAccessor<2, dim>::vertex (const unsigned int i) const { - return this->tria->vertices[vertex_index(i)]; + return const_cast &> (this->tria->vertices[vertex_index(i)]); }; @@ -643,7 +643,7 @@ template Point & TriaObjectAccessor<3, dim>::vertex (const unsigned int i) const { - return this->tria->vertices[vertex_index(i)]; + return const_cast &> (this->tria->vertices[vertex_index(i)]); }; diff --git a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc index a9a19900aa..15589a141f 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc @@ -34,7 +34,7 @@ using namespace std; /* ------------------------ MGDoFLineAccessor --------------------------- */ template -MGDoFObjectAccessor<1, dim>::MGDoFObjectAccessor (Triangulation *tria, +MGDoFObjectAccessor<1, dim>::MGDoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data) : @@ -191,7 +191,7 @@ MGDoFObjectAccessor<1, dim>::copy_from (const MGDoFObjectAccessor<1, dim> &a) /* ------------------------ MGDoFQuadAccessor --------------------------- */ template -MGDoFObjectAccessor<2, dim>::MGDoFObjectAccessor (Triangulation *tria, +MGDoFObjectAccessor<2, dim>::MGDoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data) : @@ -373,7 +373,7 @@ MGDoFObjectAccessor<2, dim>::copy_from (const MGDoFObjectAccessor<2, dim> &a) /* ------------------------ MGDoFHexAccessor --------------------------- */ template -MGDoFObjectAccessor<3, dim>::MGDoFObjectAccessor (Triangulation *tria, +MGDoFObjectAccessor<3, dim>::MGDoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data) : -- 2.39.5