OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0023373: MSVC++ warnings issued during compilation for 64bits, 'Sparse Arrays'

Browse Source 
Replaced 'Standard_Integer' with 'Standard_Size' to avoid compiler warning.
Removed redundant casting to 'Standard_Size'.
Removed code checking if a 'Standard_Size' variable is negative.
This commit is contained in:
Pawel
2012-08-24 14:18:55 +04:00
parent 6318e884de
commit d93f7683c9
5 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/NCollection/NCollection_SparseArrayBase.cxx
View File

@@ -202,12 +202,10 @@ void NCollection_SparseArrayBase::exchange (NCollection_SparseArrayBase& theOthe
//purpose :
//=======================================================================
Standard_Address NCollection_SparseArrayBase::setValue (const Standard_Integer theIndex,
Standard_Address NCollection_SparseArrayBase::setValue (const Standard_Size theIndex,
const Standard_Address theValue)
{
Standard_OutOfRange_Raise_if (theIndex<0,"NCollection_SparseArray::SetValue()")
Standard_Size anIndex = (Standard_Size)theIndex;
Standard_Size iBlock = anIndex / myBlockSize;
Standard_Size iBlock = theIndex / myBlockSize;
// resize blocks array if necessary
if ( iBlock >= myNbBlocks )
@@ -222,7 +220,7 @@ Standard_Address NCollection_SparseArrayBase::setValue (const Standard_Integer t
Block aBlock (getBlock (anAddr));
// mark item as defined
Standard_Size anInd = anIndex % myBlockSize;
Standard_Size anInd = theIndex % myBlockSize;
Standard_Address anItem = getItem (aBlock, anInd);
// either create an item by copy constructor if it is new, or assign it
@@ -243,14 +241,13 @@ Standard_Address NCollection_SparseArrayBase::setValue (const Standard_Integer t
//purpose :
//=======================================================================
Standard_Boolean NCollection_SparseArrayBase::HasValue (const Standard_Integer theIndex) const
Standard_Boolean NCollection_SparseArrayBase::HasValue (const Standard_Size theIndex) const
{
Standard_Size anIndex = (Standard_Size)theIndex;
Standard_Size iBlock = anIndex / myBlockSize;
if ( theIndex < 0 || iBlock >= myNbBlocks ||
Standard_Size iBlock = theIndex / myBlockSize;
if ( iBlock >= myNbBlocks ||
! myData[iBlock] )
return Standard_False;
return getBlock(myData[iBlock]).IsSet(anIndex % myBlockSize) ? Standard_True : Standard_False;
return getBlock(myData[iBlock]).IsSet(theIndex % myBlockSize) ? Standard_True : Standard_False;
}
//=======================================================================
@@ -258,16 +255,15 @@ Standard_Boolean NCollection_SparseArrayBase::HasValue (const Standard_Integer t
//purpose :
//=======================================================================
Standard_Boolean NCollection_SparseArrayBase::UnsetValue (const Standard_Integer theIndex)
Standard_Boolean NCollection_SparseArrayBase::UnsetValue (const Standard_Size theIndex)
{
// check that the item is defined
Standard_Size anIndex = (Standard_Size)theIndex;
Standard_Size iBlock = anIndex / myBlockSize;
if ( theIndex < 0 || iBlock >= myNbBlocks || ! myData[iBlock] )
Standard_Size iBlock = theIndex / myBlockSize;
if ( iBlock >= myNbBlocks || ! myData[iBlock] )
return Standard_False;
Block aBlock (getBlock(myData[iBlock]));
Standard_Size anInd = anIndex % myBlockSize;
Standard_Size anInd = theIndex % myBlockSize;
if ( ! aBlock.Unset(anInd) )
return Standard_False;