From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d> Date: Tue, 7 Mar 2000 13:16:45 +0000 (+0000) Subject: Minor clean-ups. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45de5668b494806d2a0d8e98de989347d60b7fac;p=dealii-svn.git Minor clean-ups. git-svn-id: https://svn.dealii.org/trunk@2563 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/grid/tria_iterator.h b/deal.II/deal.II/include/grid/tria_iterator.h index d54fdd6fb2..51a5465c4d 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.h +++ b/deal.II/deal.II/include/grid/tria_iterator.h @@ -454,7 +454,7 @@ class TriaRawIterator : public bidirectional_iterator<Accessor,int> { void print (ostream &out) const; -/**@name Exceptions*/ + /**@name Exceptions*/ /*@{*/ /** * Exception @@ -477,7 +477,7 @@ class TriaRawIterator : public bidirectional_iterator<Accessor,int> { Accessor accessor; -/** + /** * Make all other iterator class templates * friends of this class. This is * necessary for the implementation of @@ -817,6 +817,7 @@ TriaRawIterator<dim,Accessor>::TriaRawIterator (const Accessor &a) : {}; + template <int dim, typename Accessor> template <typename OtherAccessor> inline @@ -825,54 +826,64 @@ TriaRawIterator<dim,Accessor>::TriaRawIterator (const TriaRawIterator<dim,OtherA {}; + template <int dim, typename Accessor> inline const Accessor & -TriaRawIterator<dim,Accessor>::operator * () const { +TriaRawIterator<dim,Accessor>::operator * () const +{ Assert (state() == valid, ExcDereferenceInvalidObject()); return accessor; }; + template <int dim, typename Accessor> inline Accessor & -TriaRawIterator<dim,Accessor>::operator * () { +TriaRawIterator<dim,Accessor>::operator * () +{ Assert (state() == valid, ExcDereferenceInvalidObject()); return accessor; }; + template <int dim, typename Accessor> inline const Accessor * -TriaRawIterator<dim,Accessor>::operator -> () const { +TriaRawIterator<dim,Accessor>::operator -> () const +{ return &(this->operator* ()); }; + template <int dim, typename Accessor> inline Accessor * -TriaRawIterator<dim,Accessor>::operator -> () { +TriaRawIterator<dim,Accessor>::operator -> () +{ return &(this->operator* ()); }; + template <int dim, typename Accessor> inline IteratorState -TriaRawIterator<dim,Accessor>::state () const { +TriaRawIterator<dim,Accessor>::state () const +{ return accessor.state (); }; -// sorry that the declaration of this function looks so ragged; I had -// to do it this way since otherwise doc++ could not parse it correctly. + template <int dim, typename Accessor> inline bool -TriaRawIterator<dim,Accessor>::operator < (const TriaRawIterator &i) const { +TriaRawIterator<dim,Accessor>::operator < (const TriaRawIterator &i) const +{ Assert (state() != invalid, ExcDereferenceInvalidObject()); Assert (i.state() != invalid, ExcDereferenceInvalidObject()); Assert (&accessor.get_triangulation() == &i.accessor.get_triangulation(), @@ -890,7 +901,8 @@ TriaRawIterator<dim,Accessor>::operator < (const TriaRawIterator &i) const { template <int dim, typename Accessor> inline TriaRawIterator<dim,Accessor> & -TriaRawIterator<dim,Accessor>::operator ++ () { +TriaRawIterator<dim,Accessor>::operator ++ () +{ Assert (state() == valid, ExcAdvanceInvalidObject()); ++accessor; @@ -898,10 +910,12 @@ TriaRawIterator<dim,Accessor>::operator ++ () { }; + template <int dim, typename Accessor> inline TriaRawIterator<dim,Accessor> & -TriaRawIterator<dim,Accessor>::operator -- () { +TriaRawIterator<dim,Accessor>::operator -- () +{ Assert (state() == valid, ExcAdvanceInvalidObject()); --accessor; @@ -909,14 +923,17 @@ TriaRawIterator<dim,Accessor>::operator -- () { }; + template <int dim, typename Accessor> inline void -TriaRawIterator<dim,Accessor>::print (ostream &out) const { +TriaRawIterator<dim,Accessor>::print (ostream &out) const +{ out << accessor.level() << "." << accessor.index(); }; + template <int dim, typename Accessor> template <typename OtherAccessor> inline @@ -925,6 +942,7 @@ TriaIterator<dim,Accessor>::TriaIterator (const TriaIterator<dim,OtherAccessor> {}; + template <int dim, typename Accessor> template <typename OtherAccessor> inline @@ -945,6 +963,7 @@ TriaIterator<dim,Accessor>::TriaIterator (const TriaRawIterator<dim,OtherAccesso }; + template <int dim, typename Accessor> template <typename OtherAccessor> inline @@ -953,6 +972,7 @@ TriaActiveIterator<dim,Accessor>::TriaActiveIterator (const TriaActiveIterator<d {}; + template <int dim, typename Accessor> template <typename OtherAccessor> inline @@ -973,30 +993,37 @@ TriaActiveIterator<dim,Accessor>::TriaActiveIterator (const TriaRawIterator<dim, }; + template <int dim, typename Accessor> inline -ostream & operator << (ostream &out, const TriaRawIterator<dim,Accessor> &i) { +ostream & operator << (ostream &out, const TriaRawIterator<dim,Accessor> &i) +{ i.print(out); return out; }; + template <int dim, typename Accessor> inline -ostream & operator << (ostream &out, const TriaIterator<dim,Accessor> &i) { +ostream & operator << (ostream &out, const TriaIterator<dim,Accessor> &i) +{ i.print(out); return out; }; + template <int dim, typename Accessor> inline -ostream & operator << (ostream &out, const TriaActiveIterator<dim,Accessor> &i) { +ostream & operator << (ostream &out, const TriaActiveIterator<dim,Accessor> &i) +{ i.print(out); return out; }; + // if in optimized mode: include more templates #ifndef DEBUG # include "tria_iterator.templates.h"