From: wolf Date: Tue, 25 Jun 2002 07:57:50 +0000 (+0000) Subject: Avoid the use of an incomplete type by using a type that is not even X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da1fadf4807b9174c762900ac979c788e8bd3c58;p=dealii-svn.git Avoid the use of an incomplete type by using a type that is not even known yet. Previously, icc wouldn't compile the code. git-svn-id: https://svn.dealii.org/trunk@6184 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 8b38cc8376..2f906ef8c2 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.h +++ b/deal.II/deal.II/include/grid/tria_iterator.h @@ -488,11 +488,11 @@ class TriaRawIterator : * Exception */ DeclException1 (ExcDereferenceInvalidObject, - TriaRawIterator, + Accessor, << "You tried to dereference an iterator for which this " << "is not possible. More information on this iterator: " - << "level=" << arg1.accessor.level() - << ", index=" << arg1.accessor.index() + << "level=" << arg1.level() + << ", index=" << arg1.index() << ", state=" << (arg1.state() == IteratorState::valid ? "valid" : (arg1.state() == IteratorState::past_the_end ? @@ -890,7 +890,7 @@ const Accessor & TriaRawIterator::operator * () const { Assert (state() == IteratorState::valid, - ExcDereferenceInvalidObject(*this)); + ExcDereferenceInvalidObject(accessor)); return accessor; }; @@ -902,7 +902,7 @@ Accessor & TriaRawIterator::operator * () { Assert (state() == IteratorState::valid, - ExcDereferenceInvalidObject(*this)); + ExcDereferenceInvalidObject(accessor)); return accessor; }; @@ -944,9 +944,9 @@ bool TriaRawIterator::operator < (const TriaRawIterator &i) const { Assert (state() != IteratorState::invalid, - ExcDereferenceInvalidObject(*this)); + ExcDereferenceInvalidObject(accessor)); Assert (i.state() != IteratorState::invalid, - ExcDereferenceInvalidObject(i)); + ExcDereferenceInvalidObject(i.accessor)); Assert (&accessor.get_triangulation() == &i.accessor.get_triangulation(), ExcInvalidComparison());