diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:53:53 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:53:53 +0000 |
| commit | 925b5fac50f5e3e6d44bf3d258dee7bff3677eee (patch) | |
| tree | d900f0516758472f1282c3b5c783aa3238846393 /sot | |
| parent | 2bd9c3e14fd34078d5e88f61675d19f39e9600fd (diff) | |
INTEGRATION: CWS warnings01 (1.3.10); FILE MERGED
2006/04/06 14:23:14 cd 1.3.10.3: #55991# Make warning free for MSVC compiler
2005/10/28 16:15:28 pl 1.3.10.2: #i55991# removed warnings for solaris platform
2005/10/21 16:25:09 pl 1.3.10.1: #i55991# removed warnings for linux platform
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/stgavl.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sot/source/sdstor/stgavl.cxx b/sot/source/sdstor/stgavl.cxx index 1d4931aa63a8..8c461ff12f80 100644 --- a/sot/source/sdstor/stgavl.cxx +++ b/sot/source/sdstor/stgavl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: stgavl.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 07:39:58 $ + * last change: $Author: hr $ $Date: 2006-06-20 05:53:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,7 +35,6 @@ #include "stgavl.hxx" -#pragma hdrstop StgAvlNode::StgAvlNode() { @@ -129,7 +128,7 @@ short StgAvlNode::Adjust( StgAvlNode** pHeavy, StgAvlNode* pNew ) pCur = pCur->pLeft; } } - nBalance += nDelta; + nBalance = nBalance + nDelta; return nDelta; } @@ -223,7 +222,7 @@ StgAvlNode* StgAvlNode::Rem( StgAvlNode** p, StgAvlNode* pDel, BOOL bPtrs ) if( *p ) { StgAvlNode* pCur = *p; - short nRes = bPtrs ? ( pCur == pDel ) : pCur->Compare( pDel ); + short nRes = bPtrs ? short( pCur == pDel ) : short(pCur->Compare( pDel )); if( !nRes ) { // Element found: remove @@ -272,15 +271,15 @@ StgAvlNode* StgAvlNode::Rem( StgAvlNode** p, StgAvlNode* pDel, BOOL bPtrs ) // Enumerate the tree for later iteration -void StgAvlNode::Enum( short& n ) +void StgAvlNode::StgEnum( short& n ) { if( this ) { if( pLeft ) - pLeft->Enum( n ); + pLeft->StgEnum( n ); nId = n++; if( pRight ) - pRight->Enum( n ); + pRight->StgEnum( n ); } } @@ -386,7 +385,7 @@ StgAvlIterator::StgAvlIterator( StgAvlNode* p ) pRoot = p; nCount = 0; if( p ) - p->Enum( nCount ); + p->StgEnum( nCount ); } StgAvlNode* StgAvlIterator::Find( short n ) |