From 877098c1da326d53c1a4b0858890d9dc45ea01aa Mon Sep 17 00:00:00 2001 From: wolf Date: Sun, 8 Nov 1998 20:40:25 +0000 Subject: [PATCH] Remove bogus changes needed to circumvent a bug in one of the egcs snapshot compilers. git-svn-id: https://svn.dealii.org/trunk@659 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/grid/tria_iterator.templates.h | 45 ++++++------------- 1 file changed, 13 insertions(+), 32 deletions(-) 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 5a2a6d2214..81937130cc 100644 --- a/deal.II/deal.II/include/grid/tria_iterator.templates.h +++ b/deal.II/deal.II/include/grid/tria_iterator.templates.h @@ -65,7 +65,7 @@ TriaRawIterator::operator != (const TriaRawIterator template TriaRawIterator TriaRawIterator::operator ++ (int) { TriaRawIterator tmp(*this); - this->operator++ (); + operator++ (); return tmp; }; @@ -75,7 +75,7 @@ TriaRawIterator TriaRawIterator::operator ++ (int) { template TriaRawIterator TriaRawIterator::operator -- (int) { TriaRawIterator tmp(*this); - this->operator-- (); + operator-- (); return tmp; }; @@ -182,7 +182,7 @@ TriaIterator & TriaIterator::operator ++ () { template TriaIterator TriaIterator::operator ++ (int) { TriaIterator tmp(*this); - this->operator++ (); + operator++ (); return tmp; }; @@ -202,7 +202,7 @@ TriaIterator & TriaIterator::operator -- () { template TriaIterator TriaIterator::operator -- (int) { TriaIterator tmp(*this); - this->operator-- (); + operator-- (); return tmp; }; @@ -237,10 +237,7 @@ TriaActiveIterator (const TriaRawIterator &i) : // has_children() is called anyway, even if // state==past_the_end, and will then // throw the exception! - // - // for egcs: write this-> to avoid internal - // compiler error - if (this->state() != past_the_end) + if (state() != past_the_end) Assert (accessor.has_children()==false, ExcAssignmentOfInactiveObject()); #endif @@ -259,10 +256,7 @@ TriaActiveIterator (const TriaIterator &i) : // has_children() is called anyway, even if // state==past_the_end, and will then // throw the exception! - // - // for egcs: write this-> to avoid internal - // compiler error - if (this->state() != past_the_end) + if (state() != past_the_end) Assert (accessor.has_children()==false, ExcAssignmentOfInactiveObject()); #endif @@ -284,10 +278,7 @@ TriaActiveIterator::TriaActiveIterator (Triangulation *parent // has_children() is called anyway, even if // state==past_the_end, and will then // throw the exception! - // - // for egcs: write this-> to avoid internal - // compiler error - if (this->state() != past_the_end) + if (state() != past_the_end) Assert (accessor.has_children()==false, ExcAssignmentOfInactiveObject()); #endif @@ -315,10 +306,7 @@ TriaActiveIterator::operator = (const TriaRawIterator to avoid internal - // compiler error - if (this->state() != past_the_end) + if (state() != past_the_end) Assert (accessor.used() && accessor.has_children()==false, ExcAssignmentOfInactiveObject()); #endif @@ -338,10 +326,7 @@ TriaActiveIterator::operator = (const TriaIterator & // has_children() is called anyway, even if // state==past_the_end, and will then // throw the exception! - // - // for egcs: write this-> to avoid internal - // compiler error - if (this->state() != past_the_end) + if (state() != past_the_end) Assert (accessor.has_children()==false, ExcAssignmentOfInactiveObject()); #endif @@ -352,10 +337,8 @@ TriaActiveIterator::operator = (const TriaIterator & template TriaActiveIterator & TriaActiveIterator::operator ++ () { - // for egcs: write this-> to avoid internal - // compiler error while (TriaIterator::operator++(), - (this->state() == valid)) + (state() == valid)) if (accessor.has_children() == false) return *this; return *this; @@ -366,7 +349,7 @@ TriaActiveIterator & TriaActiveIterator::operator ++ template TriaActiveIterator TriaActiveIterator::operator ++ (int) { TriaActiveIterator tmp(*this); - this->operator++ (); + operator++ (); return tmp; }; @@ -375,10 +358,8 @@ TriaActiveIterator TriaActiveIterator::operator ++ ( template TriaActiveIterator & TriaActiveIterator::operator -- () { - // for egcs: write this-> to avoid internal - // compiler error while (TriaIterator::operator--(), - (this->state() == valid)) + (state() == valid)) if (accessor.has_children() == false) return *this; return *this; @@ -389,7 +370,7 @@ TriaActiveIterator & TriaActiveIterator::operator -- template TriaActiveIterator TriaActiveIterator::operator -- (int) { TriaActiveIterator tmp(*this); - this->operator-- (); + operator-- (); return tmp; }; -- 2.39.5