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

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

4
src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.cxx
View File

@@ -839,8 +839,8 @@ void BOPAlgo_ArgumentAnalyzer::TestContinuity()
aExp.Init(aS, TopAbs_FACE);
for (; aExp.More(); aExp.Next()) {
const TopoDS_Face& aF = *(TopoDS_Face*)&aExp.Current();
const Handle(Geom_Surface)& aS = BRep_Tool::Surface(aF);
if (aS->Continuity() == GeomAbs_C0) {
Handle(Geom_Surface) aSurf = BRep_Tool::Surface(aF);
if (aSurf->Continuity() == GeomAbs_C0) {
aMS.Add(aF);
}
}

9
src/BOPAlgo/BOPAlgo_BOP.cxx
View File

@@ -504,7 +504,6 @@ void BOPAlgo_BOP::BuildRC()
Standard_Integer aDmin;
TopAbs_ShapeEnum aTmin;
TopoDS_Compound aC;
TopoDS_Shape aSAIm, aSTIm;
BRep_Builder aBB;
TopExp_Explorer aExp;
BOPCol_DataMapOfShapeShape aDMSSA;
@@ -581,9 +580,9 @@ void BOPAlgo_BOP::BuildRC()
const BOPCol_ListOfShape& aLT=(!bFlag1) ? myArguments : myTools;
aItLS.Initialize(aLT);
for (; aItLS.More(); aItLS.Next()) {
const TopoDS_Shape& aST=aItLS.Value();
if (myImages.IsBound(aST)){
const BOPCol_ListOfShape& aLSTIm=myImages.Find(aST);
const TopoDS_Shape& aTShape =aItLS.Value();
if (myImages.IsBound(aTShape)){
const BOPCol_ListOfShape& aLSTIm=myImages.Find(aTShape);
aItIm.Initialize(aLSTIm);
for (; aItIm.More(); aItIm.Next()) {
const TopoDS_Shape& aSTIm=aItIm.Value();
@@ -614,7 +613,7 @@ void BOPAlgo_BOP::BuildRC()
}
}// if (myImages.IsBound(aST)){
else {
aExp.Init(aST, aTmin);
aExp.Init(aTShape, aTmin);
for (; aExp.More(); aExp.Next()) {
const TopoDS_Shape aSIm=aExp.Current();
// skip degenerated edges

1
src/BOPAlgo/BOPAlgo_BuilderFace.cxx
View File

@@ -619,7 +619,6 @@ void BOPAlgo_BuilderFace::PerformAreas()
}
//
if (anUnUsedHoles.Extent()) {
TopoDS_Face aFace;
aBB.MakeFace(aFace, aS, aLoc, aTol);
aMSH.Add(aFace, anUnUsedHoles);
//

4
src/BOPAlgo/BOPAlgo_Builder_2.cxx
View File

@@ -742,9 +742,9 @@ void BOPAlgo_Builder::FillImagesFaces1()
//
iFlag=aVFI.Flag();
if (!iFlag) {
TopoDS_Vertex& aVx=aVFI.Vertex();
TopoDS_Vertex& aVertex=aVFI.Vertex();
TopoDS_Face& aFy=aVFI.Face();
aBB.Add(aFy, aVx);
aBB.Add(aFy, aVertex);
}
}
}

4
src/BOPAlgo/BOPAlgo_Builder_3.cxx
View File

@@ -664,7 +664,7 @@ void BOPAlgo_Builder::FillIn3DParts
BOPAlgo_FillIn3DParts& aFIP=aVFIP(k);
bHasImage=aFIP.HasImage();
const TopoDS_Solid& aSolid=aFIP.Solid();
const TopoDS_Solid& aSD=aFIP.DraftSolid();
const TopoDS_Solid& aSDraft =aFIP.DraftSolid();
const BOPCol_ListOfShape& aLFIN=aFIP.LFIN();
const BOPCol_ListOfShape& aLIF=aFIP.LIF();
//
@@ -689,7 +689,7 @@ void BOPAlgo_Builder::FillIn3DParts
}
//
if (aNbFIN || bHasImage) {
theDraftSolids.Bind(aSolid, aSD);
theDraftSolids.Bind(aSolid, aSDraft);
}
}
}

7
src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
View File

@@ -450,7 +450,7 @@ void BOPAlgo_PaveFiller::PerformEE()
BOPTools_AlgoTools::MakeNewVertex(aE1, aT1, aE2, aT2, aVnew);
// <-LXBR
{
Standard_Integer nVS[2], iFound, k;
Standard_Integer nVS[2], iFound;
Standard_Real aTolVx, aTolVnew, aD2, aDT2;
BOPCol_MapOfInteger aMV;
gp_Pnt aPnew, aPx;
@@ -472,8 +472,8 @@ void BOPAlgo_PaveFiller::PerformEE()
aTolVnew=BRep_Tool::Tolerance(aVnew);
aPnew=BRep_Tool::Pnt(aVnew);
//
for (k=0; k<=j; ++k) {
const TopoDS_Vertex& aVx= *(TopoDS_Vertex*)&(myDS->Shape(nVS[k]));
for (Standard_Integer k1=0; k1<=j; ++k1) {
const TopoDS_Vertex& aVx= *(TopoDS_Vertex*)&(myDS->Shape(nVS[k1]));
aTolVx=BRep_Tool::Tolerance(aVx);
aPx=BRep_Tool::Pnt(aVx);
aD2=aPnew.SquareDistance(aPx);
@@ -588,7 +588,6 @@ Standard_Integer BOPAlgo_PaveFiller::PerformVerticesEE
//
Standard_Integer nVx, iV, j, nE, iFlag, iX, i, aNb;
Standard_Real aT;
TopoDS_Shape aV;
BOPCol_ListIteratorOfListOfShape aItLS;
BOPCol_ListIteratorOfListOfInteger aItLI;
BOPDS_ListIteratorOfListOfPaveBlock aItLPB;

22
src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx
View File

@@ -1939,7 +1939,7 @@ void BOPAlgo_PaveFiller::RemoveUsedVertices(BOPDS_Curve& aNC,
const BOPCol_ListOfInteger& aFaces = aCB1->Faces();
aIt.Initialize(aLPB);
for (; aIt.More(); aIt.Next()) {
const Handle(BOPDS_PaveBlock)& aPB = aIt.Value();
const Handle(BOPDS_PaveBlock)& aPBValue = aIt.Value();
//
aCB = new BOPDS_CommonBlock;
aIt1.Initialize(aLPB1);
@@ -1948,9 +1948,9 @@ void BOPAlgo_PaveFiller::RemoveUsedVertices(BOPDS_Curve& aNC,
nE = aPB2->OriginalEdge();
//
aPB2n = new BOPDS_PaveBlock;
aPB2n->SetPave1(aPB->Pave1());
aPB2n->SetPave2(aPB->Pave2());
aPB2n->SetEdge(aPB->Edge());
aPB2n->SetPave1(aPBValue->Pave1());
aPB2n->SetPave2(aPBValue->Pave2());
aPB2n->SetEdge(aPBValue->Edge());
aPB2n->SetOriginalEdge(nE);
aCB->AddPaveBlock(aPB2n);
myDS->SetCommonBlock(aPB2n, aCB);
@@ -1997,8 +1997,8 @@ void BOPAlgo_PaveFiller::RemoveUsedVertices(BOPDS_Curve& aNC,
//
aIt.Initialize(aLPB);
for (; aIt.More(); aIt.Next()) {
Handle(BOPDS_PaveBlock)& aPB = aIt.ChangeValue();
const TopoDS_Edge& aE = *(TopoDS_Edge*)&myDS->Shape(aPB->Edge());
Handle(BOPDS_PaveBlock)& aPBChangeValue = aIt.ChangeValue();
const TopoDS_Edge& aE = *(TopoDS_Edge*)&myDS->Shape(aPBChangeValue->Edge());
aTolE = BRep_Tool::Tolerance(aE);
//
IntTools_EdgeFace anEF;
@@ -2006,7 +2006,7 @@ void BOPAlgo_PaveFiller::RemoveUsedVertices(BOPDS_Curve& aNC,
anEF.SetFace(aF);
anEF.SetTolE(aTolE);
anEF.SetTolF(aTolF);
anEF.SetRange(aPB->Pave1().Parameter(), aPB->Pave2().Parameter());
anEF.SetRange(aPBChangeValue->Pave1().Parameter(), aPBChangeValue->Pave2().Parameter());
anEF.SetContext(myContext);
anEF.Perform();
//
@@ -2015,15 +2015,15 @@ void BOPAlgo_PaveFiller::RemoveUsedVertices(BOPDS_Curve& aNC,
Standard_Boolean bCoinc = (aCPrts(1).Type() == TopAbs_EDGE);
if (bCoinc) {
if (bCB) {
aCB = myDS->CommonBlock(aPB);
aCB = myDS->CommonBlock(aPBChangeValue);
} else {
aCB = new BOPDS_CommonBlock;
aCB->AddPaveBlock(aPB);
myDS->SetCommonBlock(aPB, aCB);
aCB->AddPaveBlock(aPBChangeValue);
myDS->SetCommonBlock(aPBChangeValue, aCB);
}
aCB->AddFace(nF);
//
aMPBIn.Add(aPB);
aMPBIn.Add(aPBChangeValue);
}
}
}

2
src/BOPAlgo/BOPAlgo_WireSplitter.cxx
View File

@@ -225,7 +225,7 @@ void BOPAlgo_WireSplitter::MakeConnexityBlocks()
}
//
if (bRegular) {
Standard_Integer k, aNbVR, aNbER;
Standard_Integer aNbVR, aNbER;
//
aNbVR=aMVER.Extent();
for (k=1; k<=aNbVR; ++k) {