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

0024171: Eliminate CLang compiler warning -Wreorder

Browse Source 
Got rid of -Wreorder warning (wrong fields' initialization order); some warnings -Wdangling-else are also fixed
This commit is contained in:
omy
2013-09-12 11:30:34 +04:00
committed by abv
parent 105aae761e
commit eafb234bf1
63 changed files with 608 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/AIS/AIS_InteractiveContext_1.cxx
View File

@@ -207,13 +207,14 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo(const Standard_Integer XPix
selector->Init();
if ( selector->More() )
{
if ( HasOpenedContext() )
if ( HasOpenedContext() )
{
if ( !myFilters->IsOk( selector->OnePicked() ) )
return AIS_SOD_AllBad;
return AIS_SOD_AllBad;
else
if ( !myLocalContexts( myCurLocalIndex )->Filter()->IsOk( selector->OnePicked() ) )
return AIS_SOD_AllBad;
}
// Does nothing if previously detected object is equal to the current one
if ( selector->OnePicked()->Selectable() == myLastPicked )

3
src/AIS/AIS_LocalContext.cxx
View File

@@ -538,7 +538,7 @@ Standard_Boolean AIS_LocalContext::Remove(const Handle(AIS_InteractiveObject)& a
const Handle(V3d_Viewer)& aViewer = myCTX->CurrentViewer();
for(i = 1; i <= myMapOfOwner.Extent(); i++){
const Handle(SelectMgr_EntityOwner)& anOwner = myMapOfOwner(i) ;
if(!anOwner.IsNull())
if(!anOwner.IsNull()) {
if(anOwner->Selectable() != aSelectable)
ownersToKeep.Add(anOwner);
else
@@ -549,6 +549,7 @@ Standard_Boolean AIS_LocalContext::Remove(const Handle(AIS_InteractiveObject)& a
Unhilight(anOwner, aViewer->ActiveView());
}
}
}
}
myMapOfOwner.Clear();
myMapOfOwner.Assign(ownersToKeep);

11
src/AIS/AIS_Selection.cxx
View File

@@ -248,11 +248,12 @@ AIS_SelectStatus AIS_Selection::Select(const Handle(Standard_Transient)& anObjec
if ( S->myResultMap.IsBound( anObject ) ){
AIS_NListTransient::Iterator aListIter = S->myResultMap.Find( anObject );
//skt-----------------------------------------------------------------
if( S->myIterator == aListIter )
if( S->myIterator.More() )
S->myIterator.Next();
else
S->myIterator = AIS_NListTransient::Iterator();
if( S->myIterator == aListIter ) {
if( S->myIterator.More() )
S->myIterator.Next();
else
S->myIterator = AIS_NListTransient::Iterator();
}
//--------------------------------------------------------------------
#ifdef BUC60953
// In the mode of advanced mesh selection only one owner is created