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

0024171: Eliminate CLang compiler warning -Wreorder

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

View File

@@ -87,11 +87,12 @@ void SelectMgr_EntityOwner::HilightWithColor(const Handle(PrsMgr_PresentationMan
const Quantity_NameOfColor aColor,
const Standard_Integer aMode)
{
if( HasSelectable() )
if( HasSelectable() ) {
if( IsAutoHilight() )
PM->Color(mySelectable,aColor,aMode);
else
mySelectable->HilightOwnerWithColor( PM, aColor, this );
}
}
void SelectMgr_EntityOwner::Unhilight(const Handle(PrsMgr_PresentationManager)& PM,

View File

@@ -182,7 +182,7 @@ void SelectMgr_SelectableObject::ResetLocation()
for(Sel->Init();Sel->More();Sel->Next()){
SE = *((Handle(Select3D_SensitiveEntity)*) &(Sel->Sensitive()));
if(!SE.IsNull()){
if(SE->HasLocation())
if(SE->HasLocation()) {
if( SE->Location()==myLocation){
SE->ResetLocation();
const Handle(SelectBasics_EntityOwner)& EO = SE->OwnerId();
@@ -192,7 +192,7 @@ void SelectMgr_SelectableObject::ResetLocation()
SE->SetLocation(iniloc*myLocation.Inverted());
const Handle(SelectBasics_EntityOwner)& EO = SE->OwnerId();
(*((Handle(SelectMgr_EntityOwner)*)&EO))->SetLocation(SE->Location());}
}
}
}
Sel->UpdateStatus(SelectMgr_TOU_None);