1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00

0024058: Eliminate compiler warning C4702 in MSVC++ with warning level 4

Got rid of most of warnings of C4702 type: unreachable code.
Returned some #ifdef DEB
Fixed tabs formatting
Fixed some mistakes in code
This commit is contained in:
omy
2013-07-12 12:54:01 +04:00
parent c1746a0ac9
commit d3f26155b5
59 changed files with 494 additions and 672 deletions

View File

@@ -136,8 +136,8 @@ void MeshVS_MeshOwner::SetDetectedEntities (const Handle(TColStd_HPackedMapOfInt
// Purpose :
//================================================================
void MeshVS_MeshOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager3d)& thePM,
const Quantity_NameOfColor theColor,
const Standard_Integer /*theMode*/)
const Quantity_NameOfColor theColor,
const Standard_Integer /*theMode*/)
{
Handle( SelectMgr_SelectableObject ) aSelObj;
if ( HasSelectable() )
@@ -151,21 +151,17 @@ void MeshVS_MeshOwner::HilightWithColor (const Handle(PrsMgr_PresentationManager
if( !aNodes.IsNull() && aNodes->Map().Extent() == 1 )
{
TColStd_MapIteratorOfPackedMapOfInteger anIt( aNodes->Map() );
for( ; anIt.More(); anIt.Next() )
if( myLastID != anIt.Key() )
{
if( myLastID != anIt.Key() )
myLastID = anIt.Key();
break;
myLastID = anIt.Key();
}
}
}
else if( !aElems.IsNull() && aElems->Map().Extent() == 1 )
{
TColStd_MapIteratorOfPackedMapOfInteger anIt( aElems->Map() );
for( ; anIt.More(); anIt.Next() )
if( myLastID != anIt.Key() )
{
if( myLastID != anIt.Key() )
myLastID = anIt.Key();
break;
myLastID = anIt.Key();
}
}
@@ -201,24 +197,20 @@ Standard_Boolean MeshVS_MeshOwner::IsForcedHilight () const
if( !aNodes.IsNull() && aNodes->Map().Extent() == 1 )
{
TColStd_MapIteratorOfPackedMapOfInteger anIt( aNodes->Map() );
for( ; anIt.More(); anIt.Next() )
{
aKey = anIt.Key();
if( myLastID == aKey )
aHilight = Standard_False;
break;
aKey = anIt.Key();
if( myLastID == aKey )
{
aHilight = Standard_False;
}
}
Handle(TColStd_HPackedMapOfInteger) aElems = GetDetectedElements();
if( !aElems.IsNull() && aElems->Map().Extent() == 1 )
{
TColStd_MapIteratorOfPackedMapOfInteger anIt( aElems->Map() );
for( ; anIt.More(); anIt.Next() )
aKey = anIt.Key();
if( myLastID == aKey )
{
aKey = anIt.Key();
if( myLastID == aKey )
aHilight = Standard_False;
break;
aHilight = Standard_False;
}
}
}