From: bangerth Date: Sat, 13 Nov 2010 01:38:11 +0000 (+0000) Subject: Crap, I messed up again :-( X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c70fe47edf3573e293d923e7f5029f7f0f0742d;p=dealii-svn.git Crap, I messed up again :-( git-svn-id: https://svn.dealii.org/trunk@22717 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/dofs/dof_accessor.h b/deal.II/include/deal.II/dofs/dof_accessor.h index 4827e71b32..494e47fc08 100644 --- a/deal.II/include/deal.II/dofs/dof_accessor.h +++ b/deal.II/include/deal.II/dofs/dof_accessor.h @@ -2031,6 +2031,27 @@ class DoFCellAccessor : public DoFAccessor */ void update_cell_dof_indices_cache () const; + private: + /** + * Copy operator. This is normally used + * in a context like iterator a,b; + * *a=*b;. Presumably, the intent + * here is to copy the object pointed to + * by @p b to the object pointed to by + * @p a. However, the result of + * dereferencing an iterator is not an + * object but an accessor; consequently, + * this operation is not useful for + * iterators on triangulations. We + * declare this function here private, + * thus it may not be used from outside. + * Furthermore it is not implemented and + * will give a linker error if used + * anyway. + */ + DoFCellAccessor & + operator = (const DoFCellAccessor &da); + /** * Make the DoFHandler class a * friend so that it can call the diff --git a/deal.II/include/deal.II/multigrid/mg_dof_accessor.h b/deal.II/include/deal.II/multigrid/mg_dof_accessor.h index c7d363e988..42a14d8942 100644 --- a/deal.II/include/deal.II/multigrid/mg_dof_accessor.h +++ b/deal.II/include/deal.II/multigrid/mg_dof_accessor.h @@ -387,10 +387,26 @@ class MGDoFAccessor : public internal::MGDoFAccessor::Inheritanceiterator a,b; + * *a=*b;. Presumably, the intent + * here is to copy the object pointed to + * by @p b to the object pointed to by + * @p a. However, the result of + * dereferencing an iterator is not an + * object but an accessor; consequently, + * this operation is not useful for + * iterators on triangulations. We + * declare this function here private, + * thus it may not be used from outside. + * Furthermore it is not implemented and + * will give a linker error if used + * anyway. + */ + MGDoFAccessor & + operator = (const MGDoFAccessor &da); template friend class MGDoFHandler; friend class internal::MGDoFHandler::Implementation; @@ -585,7 +601,7 @@ class MGDoFCellAccessor : public MGDoFAccessor /** * @} */ - + /** * Return the parent as a MGDoF cell * iterator. This function is needed since diff --git a/deal.II/source/multigrid/mg_dof_accessor.cc b/deal.II/source/multigrid/mg_dof_accessor.cc index c644a2cd2b..d76a13a0cf 100644 --- a/deal.II/source/multigrid/mg_dof_accessor.cc +++ b/deal.II/source/multigrid/mg_dof_accessor.cc @@ -65,18 +65,6 @@ MGDoFAccessor::set_mg_dof_handler (MGDoFHandler -MGDoFAccessor & -MGDoFAccessor::operator = (const MGDoFAccessor &da) -{ - BaseClass::operator= (*this); - - set_dof_handler (da.mg_dof_handler); - return *this; -} - - - template unsigned int MGDoFAccessor::mg_vertex_dof_index (const int level, @@ -181,7 +169,7 @@ MGDoFAccessor::parent () const { Assert (this->level () > 0, ExcMessage ("Cell is at coarsest level.")); - + const TriaIterator > q (this->tria, (structdim == dim ?