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

0026586: Eliminate compile warnings obtained by building occt with vc14: declaration of local variable hides previous local declaration

Browse Source 
Eliminated warnings about "declaration of some local variable hides previous local declaration"
This commit is contained in:
ski
2015-09-08 15:41:26 +03:00
committed by bugmaster
parent 695c6eed26
commit 5174095875
186 changed files with 1382 additions and 1466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/BRepTools/BRepTools_NurbsConvertModification.cxx
View File

@@ -396,8 +396,6 @@ Standard_Boolean BRepTools_NurbsConvertModification::NewCurve2d
Geom2dAdaptor_Curve G2dAC(C2d, f2d, l2d);
Handle(Geom2dAdaptor_HCurve) G2dAHC = new Geom2dAdaptor_HCurve(G2dAC);
TopLoc_Location Loc;
Handle(Geom_Curve) C3d = BRep_Tool::Curve(E, Loc, f3d,l3d);
if(!newE.IsNull()) {
C3d = BRep_Tool::Curve(newE, f3d, l3d);
}
@@ -493,7 +491,7 @@ Standard_Boolean BRepTools_NurbsConvertModification::NewCurve2d
}
if (!itled.More()) { // on stocke l`edge et la curve2d
Handle(Geom2d_Curve) C2dBis;
Standard_Real f3d,l3d,f2dBis,l2dBis;
Standard_Real f2dBis,l2dBis;
C2d = new Geom2d_TrimmedCurve(C2d, f2d, l2d);
Geom2dAdaptor_Curve G2dAC(C2d, f2d, l2d);
Handle(Geom2dAdaptor_HCurve) G2dAHC = new Geom2dAdaptor_HCurve(G2dAC);
@@ -505,8 +503,6 @@ Standard_Boolean BRepTools_NurbsConvertModification::NewCurve2d
Geom2dAdaptor_Curve G2dACBis(C2dBis, f2dBis, l2dBis);
Handle(Geom2dAdaptor_HCurve) G2dAHCBis = new Geom2dAdaptor_HCurve(G2dACBis);
TopLoc_Location Loc;
Handle(Geom_Curve) C3d = BRep_Tool::Curve(E, f3d,l3d);
if(C3d.IsNull()) {
if(isConvert2d) {
Curve2d = Handle(Geom2d_Curve)::DownCast(C2d->Copy());

12
src/BRepTools/BRepTools_Quilt.cxx
View File

@@ -435,17 +435,17 @@ TopoDS_Shape BRepTools_Quilt::Shells() const
// Add the faces of oldShell in SH.
for (TopoDS_Iterator its(oldShell); its.More(); its.Next()) {
const TopoDS_Face Fo = TopoDS::Face(its.Value());
TopAbs_Orientation NewO;
TopAbs_Orientation NewOFo;
// update the orientation of Fo in SH.
if (Rev)
NewO = TopAbs::Reverse(MF(Fo).Orientation());
NewOFo = TopAbs::Reverse(MF(Fo).Orientation());
else
NewO = MF(Fo).Orientation();
NewOFo = MF(Fo).Orientation();
MF.Bind(Fo,SH.Oriented(NewO));
MF.Bind(Fo,SH.Oriented(NewOFo));
// B.Add (SH.Oriented(TopAbs_FORWARD),Fo.Oriented(NewO));
TopoDS_Shape arefShape = SH.Oriented(TopAbs_FORWARD) ;
B.Add ( arefShape ,Fo.Oriented(NewO));
TopoDS_Shape arefShapeFo = SH.Oriented(TopAbs_FORWARD) ;
B.Add ( arefShapeFo,Fo.Oriented(NewOFo));
}
// Rebind the free edges of the old shell to the new shell
//gka BUG 6491