1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00

Fix of compiler warnings on OCCT 7.0.0.beta (CLang and VC++ 14)

This commit is contained in:
abv
2015-12-27 14:48:22 +03:00
parent 13c7b7a395
commit 8bb8064e8f
5 changed files with 12 additions and 19 deletions

View File

@@ -460,9 +460,9 @@ void BOPAlgo_PaveFiller::PerformEE()
if (bLineLine) {
// increase tolerance for Line/Line intersection, but do not update
// the vertex till its intersection with some other shape
Standard_Real aTol = (aCR1.Last() - aCR1.First()) / 2.;
if (aTol > aTolVnew) {
aTolVnew = aTol;
Standard_Real aTolMin = (aCR1.Last() - aCR1.First()) / 2.;
if (aTolMin > aTolVnew) {
aTolVnew = aTolMin;
}
}
// <-LXBR

View File

@@ -454,7 +454,6 @@ Standard_Integer BOPAlgo_PaveFiller::PerformVerticesEF
//
Standard_Integer nVx, nVSD, iV, iErr, nE, iFlag, iX, i, aNbPBLI;
Standard_Real aT, dummy;
TopoDS_Shape aV;
BOPCol_ListIteratorOfListOfShape aItLS;
BOPCol_ListIteratorOfListOfInteger aItLI;
BOPDS_PDS aPDS;
@@ -504,12 +503,7 @@ Standard_Integer BOPAlgo_PaveFiller::PerformVerticesEF
const TopoDS_Shape& aVx = aItLS.Value();
nVx = aPDS->Index(aVx);
//
if (aPDS->HasShapeSD(nVx, nVSD)) {
aV = aPDS->Shape(nVSD);
}
else {
aV = aVx;
}
const TopoDS_Shape& aV = (aPDS->HasShapeSD(nVx, nVSD) ? aPDS->Shape(nVSD) : aVx);
BOPCol_ListOfShape* pLst = aImages.ChangeSeek(aV);
if (!pLst) {
pLst = &aImages.ChangeFromIndex(aImages.Add(aV, BOPCol_ListOfShape()));
@@ -554,12 +548,7 @@ Standard_Integer BOPAlgo_PaveFiller::PerformVerticesEF
const TopoDS_Shape& aVx=aItLS.Value();
nVx=aPDS->Index(aVx);
//
if (aPDS->HasShapeSD(nVx, nVSD)) {
aV=aPDS->Shape(nVSD);
}
else {
aV=aVx;
}
const TopoDS_Shape& aV = (aPDS->HasShapeSD(nVx, nVSD) ? aPDS->Shape(nVSD) : aVx);
iV = aMVI.Find(aV);
//
BOPDS_CoupleOfPaveBlocks &aCPB=theMVCPB.ChangeFromKey(aVx);