From b4c20bfbd26f429f86bf07c9e2bba39535002c04 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Fri, 30 Jul 2004 14:15:34 +0000 Subject: INTEGRATION: CWS gcc340fixes01 (1.6.78); FILE MERGED 2004/07/22 13:57:53 hr 1.6.78.2: #i28294#: use a more idiomatic approach to resolve template class bese members/methods 2004/06/04 15:02:11 fa 1.6.78.1: #i28450# gcc 3.4 fixes (must use explicit scoping) --- xml2cmp/source/support/list.hxx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'xml2cmp') diff --git a/xml2cmp/source/support/list.hxx b/xml2cmp/source/support/list.hxx index 6f21648e6796..89df59fdb174 100644 --- a/xml2cmp/source/support/list.hxx +++ b/xml2cmp/source/support/list.hxx @@ -2,9 +2,9 @@ * * $RCSfile: list.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: np $ $Date: 2002-08-08 16:07:56 $ + * last change: $Author: kz $ $Date: 2004-07-30 15:15:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -252,31 +252,31 @@ List::alloc( unsigned newSpace, template DynamicList::~DynamicList() { - erase_all(); + this->erase_all(); } template void DynamicList::insert(unsigned pos, XY * const & elem) { - if ( pos > len ) + if ( pos > this->len ) return; - checkSize(len+2); - memmove(inhalt[pos+1], inhalt[pos], (len-pos) * sizeof(XY*) ); - inhalt[pos] = elem; - len++; + checkSize(this->len+2); + memmove(this->inhalt[pos+1], this->inhalt[pos], (this->len-pos) * sizeof(XY*) ); + this->inhalt[pos] = elem; + this->len++; } template void DynamicList::remove( unsigned pos ) { - if (!is_valid_index(pos) ) + if (!this->is_valid_index(pos) ) return; - len--; - delete inhalt[pos]; - memmove(inhalt[pos], inhalt[pos+1], (len-pos) * sizeof(XY*) ); + this->len--; + delete this->inhalt[pos]; + memmove(this->inhalt[pos], this->inhalt[pos+1], (this->len-pos) * sizeof(XY*) ); } -- cgit