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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
src/TNaming/TNaming.cxx
View File

@@ -990,7 +990,8 @@ static Standard_Boolean IsInternal(const TopoDS_Shape& aSx)
TopoDS_Iterator aIt;
bInternal = Standard_False;
aIt.Initialize(aSx);
for (; aIt.More(); aIt.Next()) {
for (; aIt.More(); aIt.Next())
{
const TopoDS_Shape& aSy=aIt.Value();
aOr=aSy.Orientation();
bInternal = (aOr == TopAbs_INTERNAL || aOr == TopAbs_EXTERNAL);

24
src/TNaming/TNaming_Localizer.cxx
View File

@@ -330,26 +330,26 @@ void TNaming_Localizer::GoBack (const TopoDS_Shape& S,
FindFeaturesInAncestors (S, Sol, AncInFeature);
TopTools_MapIteratorOfMapOfShape itF(AncInFeature);
for ( ; itF.More(); itF.Next()) {
const TopoDS_Shape& AncOfS = itF.Key();
LBS .Append(AncOfS);
LBNS.Append(TNaming_Tool::NamedShape(AncOfS,Lab));
const TopoDS_Shape& AncOfS = itF.Key();
LBS .Append(AncOfS);
LBNS.Append(TNaming_Tool::NamedShape(AncOfS,Lab));
}
}
}
else {
for ( ; it.More(); it.Next()) {
// if (it.NamedShape()->Evolution() != TNaming_SELECTED) {
// if (it.NamedShape()->Evolution() != TNaming_SELECTED) {
if (it.NamedShape()->Evolution() == Evol) {
Handle(TNaming_NamedShape) NS = TNaming_Tool::NamedShape(it.Shape(),Lab);
if (!NS.IsNull()) {
LBS.Append (it.Shape());
LBNS.Append (TNaming_Tool::NamedShape(it.Shape(),Lab));
}
else {
Handle(TNaming_NamedShape) NS = TNaming_Tool::NamedShape(it.Shape(),Lab);
if (!NS.IsNull()) {
LBS.Append (it.Shape());
LBNS.Append (TNaming_Tool::NamedShape(it.Shape(),Lab));
}
else {
#ifdef DEB
cout <<"TNaming_Localizer: Shape modifie sans avoir ete cree"<<endl;
cout <<"TNaming_Localizer: Shape modifie sans avoir ete cree"<<endl;
#endif
}
}
}
}
}

12
src/TNaming/TNaming_Name.cxx
View File

@@ -1185,13 +1185,13 @@ static TopoDS_Shape FindShape(const TNaming_DataMapOfShapeMapOfShape& DM)
Standard_Boolean isCand(Standard_True); // aS is a Candidate
TNaming_DataMapIteratorOfDataMapOfShapeMapOfShape it2(DM);
for (;it2.More();it2.Next()) {
const TopoDS_Shape& aKey2 = it2.Key();
if(aKey2 == aKey1) continue;
const TNaming_MapOfShape& aMap2 = it2.Value();
if(!aMap2.Contains(aS)) isCand = Standard_False;
const TopoDS_Shape& aKey2 = it2.Key();
if(aKey2 == aKey1) continue;
const TNaming_MapOfShape& aMap2 = it2.Value();
if(!aMap2.Contains(aS)) isCand = Standard_False;
}
if(isCand)
List.Append(aS);
if(isCand)
List.Append(aS);
}
break;
}