]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
The constructors of all DoFAccessor, TriaAccessor and TriaIterator classes now take...
authorhartmann <hartmann@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 12 Jun 2002 11:53:30 +0000 (11:53 +0000)
committerhartmann <hartmann@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 12 Jun 2002 11:53:30 +0000 (11:53 +0000)
git-svn-id: https://svn.dealii.org/trunk@6072 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/dofs/dof_accessor.h
deal.II/deal.II/include/grid/tria_accessor.h
deal.II/deal.II/include/grid/tria_iterator.h
deal.II/deal.II/include/grid/tria_iterator.templates.h
deal.II/deal.II/include/multigrid/mg_dof_accessor.h
deal.II/deal.II/source/grid/tria_accessor.cc
deal.II/deal.II/source/multigrid/mg_dof_accessor.cc

index b405301814a677ac293ac44858e9082a3c6ae788..759a25256f72934b0d0394ab5023d8ec8e5604e2 100644 (file)
@@ -257,7 +257,7 @@ class DoFObjectAccessor : public DoFAccessor<dim>,
                                      * argument is assumed to be a pointer
                                      * to a @ref{DoFHandler} object.
                                      */
-    DoFObjectAccessor (Triangulation<dim> *tria,
+    DoFObjectAccessor (const Triangulation<dim> *tria,
                       const int           level,
                       const int           index,
                       const AccessorData *local_data) :
@@ -511,7 +511,7 @@ class DoFObjectAccessor<1, dim> :  public DoFAccessor<dim>,
                                      * argument is assumed to be a pointer
                                      * to a @ref{DoFHandler} object.
                                      */
-    DoFObjectAccessor (Triangulation<dim> *tria,
+    DoFObjectAccessor (const Triangulation<dim> *tria,
                       const int           level,
                       const int           index,
                       const AccessorData *local_data) :
@@ -699,7 +699,7 @@ class DoFObjectAccessor<2, dim> :  public DoFAccessor<dim>,
                                      * argument is assumed to be a pointer
                                      * to a @ref{DoFHandler} object.
                                      */
-    DoFObjectAccessor (Triangulation<dim> *tria,
+    DoFObjectAccessor (const Triangulation<dim> *tria,
                       const int           level,
                       const int           index,
                       const AccessorData *local_data) :
@@ -896,7 +896,7 @@ class DoFObjectAccessor<3, dim> :  public DoFAccessor<dim>,
                                      * argument is assumed to be a pointer
                                      * to a @ref{DoFHandler} object.
                                      */
-    DoFObjectAccessor (Triangulation<dim> *tria,
+    DoFObjectAccessor (const Triangulation<dim> *tria,
                       const int           level,
                       const int           index,
                       const AccessorData *local_data) :
@@ -1098,7 +1098,7 @@ class DoFCellAccessor :  public DoFObjectAccessor<dim, dim>
                                     /**
                                      * Constructor
                                      */
-    DoFCellAccessor (Triangulation<dim> *tria,
+    DoFCellAccessor (const Triangulation<dim> *tria,
                     const int           level,
                     const int           index,
                     const AccessorData *local_data) :
index c34bb178f8b81d07ab4c7306699d3dbc0589144f..08cb3ef384f3d7f4403b7f17136eef1495c380d3 100644 (file)
@@ -80,7 +80,7 @@ class TriaAccessor
                                      *  only callable from friend
                                      *  classes.
                                      */
-    TriaAccessor (Triangulation<dim> *parent     = 0,
+    TriaAccessor (const Triangulation<dim> *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<dim> *tria;
+    const Triangulation<dim> *tria;
 
     template <int anydim, typename Accessor> friend class TriaRawIterator;
     template <int anydim, typename Accessor> friend class TriaIterator;
@@ -295,7 +295,7 @@ class TriaObjectAccessor :  public TriaAccessor<dim>
                                      * By default, an illegal
                                      * accessor is constructed.
                                      */
-    TriaObjectAccessor (Triangulation<dim> *parent     = 0,
+    TriaObjectAccessor (const Triangulation<dim> *parent     = 0,
                        const int           level      = -1,
                        const int           index      = -1,
                        const AccessorData *local_data = 0) :
@@ -329,7 +329,7 @@ class TriaObjectAccessor :  public TriaAccessor<dim>
     int vertex_index (const unsigned int i) const;
 
                                     /**
-                                     *  Reference (not an iterator!)
+                                     *  Const reference (not an iterator!)
                                      *  to the @p{i}th vertex.
                                      */
     Point<dim> & vertex (const unsigned int i) const;
@@ -683,7 +683,7 @@ class TriaObjectAccessor<0, dim> : public TriaAccessor<dim>
                                      * Constructor. Should never be called and
                                      * thus produces an error.
                                      */
-    TriaObjectAccessor (Triangulation<dim> *parent     = 0,
+    TriaObjectAccessor (const Triangulation<dim> *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<dim>
                                     /**
                                      *  Constructor.
                                      */
-    TriaObjectAccessor (Triangulation<dim> *parent     = 0,
+    TriaObjectAccessor (const Triangulation<dim> *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<dim>
                                     /**
                                      *  Constructor.
                                      */
-    TriaObjectAccessor (Triangulation<dim> *parent     = 0,
+    TriaObjectAccessor (const Triangulation<dim> *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<dim>
                                     /**
                                      *  Constructor.
                                      */
-    TriaObjectAccessor (Triangulation<dim> *parent     = 0,
+    TriaObjectAccessor (const Triangulation<dim> *parent     = 0,
                        const int           level      = -1,
                        const int           index      = -1,
                        const AccessorData *local_data = 0) :
@@ -1822,7 +1822,7 @@ class CellAccessor :  public TriaObjectAccessor<dim,dim>
                                     /**
                                      *  Constructor.
                                      */
-    CellAccessor (Triangulation<dim> *parent     = 0,
+    CellAccessor (const Triangulation<dim> *parent     = 0,
                  const int           level      = -1,
                  const int           index      = -1,
                  const AccessorData *local_data = 0) :
index c3d1724f0d7683313462f2461208cf211967ddcb..80703d3d093c4e9088801a48f4a322548a136a49 100644 (file)
@@ -285,7 +285,7 @@ class TriaRawIterator :
                                      *  of a type declared by the accessor
                                      *  class.
                                      */
-    TriaRawIterator (Triangulation<dim> *parent,
+    TriaRawIterator (const Triangulation<dim> *parent,
                     const int           level,
                     const int           index,
                     const typename AccessorType::AccessorData *local_data = 0);
@@ -568,7 +568,7 @@ class TriaIterator : public TriaRawIterator<dim,Accessor>
                                      *  used, the debug version raises
                                      *  an error!
                                      */
-    TriaIterator (Triangulation<dim> *parent,
+    TriaIterator (const Triangulation<dim> *parent,
                  const int           level,
                  const int           index,
                  const typename Accessor::AccessorData *local_data = 0);
@@ -727,7 +727,7 @@ class TriaActiveIterator : public TriaIterator<dim,Accessor>
                                      *  active, the debug version raises
                                      *  an error!
                                      */
-    TriaActiveIterator (Triangulation<dim> *parent,
+    TriaActiveIterator (const Triangulation<dim> *parent,
                        const int           level,
                        const int           index,
                        const typename Accessor::AccessorData *local_data = 0);
index 67770ff130add345875c79ce6057a66856dbda7a..56805b43f17b8e64d7c374367c8023842f5266c3 100644 (file)
@@ -42,7 +42,7 @@ TriaRawIterator<dim,Accessor>::TriaRawIterator (const TriaRawIterator<dim,Access
 
 template <int dim, typename Accessor>
 inline
-TriaRawIterator<dim,Accessor>::TriaRawIterator (Triangulation<dim> *parent,
+TriaRawIterator<dim,Accessor>::TriaRawIterator (const Triangulation<dim> *parent,
                                                const int           level,
                                                const int           index,
                                                const typename Accessor::AccessorData *local_data) :
@@ -144,7 +144,7 @@ TriaIterator<dim,Accessor>::TriaIterator (const TriaRawIterator<dim,Accessor> &i
 
 template <int dim, typename Accessor>
 inline
-TriaIterator<dim,Accessor>::TriaIterator (Triangulation<dim> *parent,
+TriaIterator<dim,Accessor>::TriaIterator (const Triangulation<dim> *parent,
                                          const int           level,
                                          const int           index,
                                          const typename Accessor::AccessorData *local_data) :
@@ -292,7 +292,7 @@ TriaActiveIterator<dim,Accessor>::TriaActiveIterator (const TriaIterator<dim,Acc
 
 template <int dim, typename Accessor>
 inline
-TriaActiveIterator<dim,Accessor>::TriaActiveIterator (Triangulation<dim> *parent,
+TriaActiveIterator<dim,Accessor>::TriaActiveIterator (const Triangulation<dim> *parent,
                                                      const int           level,
                                                      const int           index,
                                                      const typename Accessor::AccessorData *local_data) :
index 81bf9735d68e210d58e3fb46d1f25a036426620f..7b810454825c4b50ba9c3be48ddf939be9f6f6dd 100644 (file)
@@ -188,7 +188,7 @@ class MGDoFObjectAccessor<0, dim>
                                      * Constructor. Should never be called
                                      * and thus throws an error.
                                      */
-    MGDoFObjectAccessor (Triangulation<dim> *,
+    MGDoFObjectAccessor (const Triangulation<dim> *,
                         const int,
                         const int,
                         const AccessorData *)
@@ -250,7 +250,7 @@ class MGDoFObjectAccessor<1, dim> :  public MGDoFAccessor<dim>,
                                      * argument is assumed to be a pointer
                                      * to a @p{MGDoFHandler<dim>} object.
                                      */
-    MGDoFObjectAccessor (Triangulation<dim> *tria,
+    MGDoFObjectAccessor (const Triangulation<dim> *tria,
                         const int           level,
                         const int           index,
                         const AccessorData *local_data);
@@ -366,7 +366,7 @@ class MGDoFObjectAccessor<2, dim> :  public MGDoFAccessor<dim>,
                                      * argument is assumed to be a pointer
                                      * to a @ref{DoFHandler} object.
                                      */
-    MGDoFObjectAccessor (Triangulation<dim> *tria,
+    MGDoFObjectAccessor (const Triangulation<dim> *tria,
                         const int           level,
                         const int           index,
                         const AccessorData *local_data);
@@ -491,7 +491,7 @@ class MGDoFObjectAccessor<3, dim> :  public MGDoFAccessor<dim>,
                                      * argument is assumed to be a pointer
                                      * to a @ref{DoFHandler} object.
                                      */
-    MGDoFObjectAccessor (Triangulation<dim> *tria,
+    MGDoFObjectAccessor (const Triangulation<dim> *tria,
                         const int           level,
                         const int           index,
                         const AccessorData *local_data);
@@ -626,7 +626,7 @@ class MGDoFCellAccessor :  public MGDoFObjectAccessor<dim, dim> {
                                     /**
                                      * Constructor
                                      */
-    MGDoFCellAccessor (Triangulation<dim> *tria,
+    MGDoFCellAccessor (const Triangulation<dim> *tria,
                       const int           level,
                       const int           index,
                       const AccessorData *local_data) :
index c40c48e3607b5fbd2087de1685f5c5b57a32bf14..529ff3dae2ba910b926722fe121db1b9398edd4e 100644 (file)
@@ -46,7 +46,7 @@ template <int dim>
 Point<dim> &
 TriaObjectAccessor<1, dim>::vertex (const unsigned int i) const
 {
-  return this->tria->vertices[vertex_index(i)];
+  return const_cast<Point<dim> &> (this->tria->vertices[vertex_index(i)]);
 };
 
 
@@ -247,7 +247,7 @@ template <int dim>
 Point<dim> &
 TriaObjectAccessor<2, dim>::vertex (const unsigned int i) const
 {
-  return this->tria->vertices[vertex_index(i)];
+  return const_cast<Point<dim> &> (this->tria->vertices[vertex_index(i)]);
 };
 
 
@@ -643,7 +643,7 @@ template <int dim>
 Point<dim> &
 TriaObjectAccessor<3, dim>::vertex (const unsigned int i) const
 {
-  return this->tria->vertices[vertex_index(i)];
+  return const_cast<Point<dim> &> (this->tria->vertices[vertex_index(i)]);
 };
 
 
index a9a19900aaa503c5b3b259b2f26bafe1333bbbd0..15589a141fc2127551c0465f8648ca73e6752f7c 100644 (file)
@@ -34,7 +34,7 @@ using namespace std;
 /* ------------------------ MGDoFLineAccessor --------------------------- */
 
 template <int dim>
-MGDoFObjectAccessor<1, dim>::MGDoFObjectAccessor (Triangulation<dim> *tria,
+MGDoFObjectAccessor<1, dim>::MGDoFObjectAccessor (const Triangulation<dim> *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 <int dim>
-MGDoFObjectAccessor<2, dim>::MGDoFObjectAccessor (Triangulation<dim> *tria,
+MGDoFObjectAccessor<2, dim>::MGDoFObjectAccessor (const Triangulation<dim> *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 <int dim>
-MGDoFObjectAccessor<3, dim>::MGDoFObjectAccessor (Triangulation<dim> *tria,
+MGDoFObjectAccessor<3, dim>::MGDoFObjectAccessor (const Triangulation<dim> *tria,
                                                  const int           level,
                                                  const int           index,
                                                  const AccessorData *local_data) :

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.