OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0025075: BRepMesh - eliminate new x86_64 compiler warnings

Browse Source 
BRepMesh - fix compilation without TBB support

Code style
This commit is contained in:
kgv 2014-07-17 13:34:05 +04:00 committed by bugmaster
parent c308fbd7c7
commit f29db51421
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BRepMesh/BRepMesh_WireChecker.cxx
View File

@ -194,7 +194,7 @@ void BRepMesh_WireChecker::ReCompute(BRepMeshCol::HClassifier& theClassifier)
if (!collectDiscretizedWires(aDWires)) if (!collectDiscretizedWires(aDWires))
return; return;
const Standard_Integer aNbWires = aDWires.size(); const Standard_Integer aNbWires = (Standard_Integer)aDWires.size();
BRepMeshCol::Array1OfSegmentsTree aWiresBiPoints(aNbWires); BRepMeshCol::Array1OfSegmentsTree aWiresBiPoints(aNbWires);
fillSegmentsTree(aDWires, aWiresBiPoints); fillSegmentsTree(aDWires, aWiresBiPoints);
@ -362,8 +362,8 @@ void BRepMesh_WireChecker::fillSegmentsTree(
const SeqOfDWires& theDWires, const SeqOfDWires& theDWires,
BRepMeshCol::Array1OfSegmentsTree& theWiresSegmentsTree) BRepMeshCol::Array1OfSegmentsTree& theWiresSegmentsTree)
{ {
const Standard_Integer aNbWires = theDWires.size(); const size_t aNbWires = theDWires.size();
for (Standard_Integer aWireIt = 0; aWireIt < aNbWires; ++aWireIt) for (size_t aWireIt = 0; aWireIt < aNbWires; ++aWireIt)
{ {
const SeqOfPnt2d& aWire = theDWires[aWireIt]; const SeqOfPnt2d& aWire = theDWires[aWireIt];
const Standard_Integer aWireLen = aWire.Size(); const Standard_Integer aWireLen = aWire.Size();

20
src/BRepMesh/BRepMesh_WireInterferenceChecker.cxx
View File

@ -29,10 +29,10 @@ BRepMesh_WireInterferenceChecker::BRepMesh_WireInterferenceChecker(
const std::vector<BRepMeshCol::SegmentsTree>& theWires, const std::vector<BRepMeshCol::SegmentsTree>& theWires,
BRepMesh_Status* theStatus, BRepMesh_Status* theStatus,
Standard_Mutex* theMutex) Standard_Mutex* theMutex)
: myWires(&theWires.front()), : myWires (&theWires.front()),
myWiresNb(theWires.size()), myWiresNb ((Standard_Integer)theWires.size()),
myStatus(theStatus), myStatus (theStatus),
myMutex(theMutex) myMutex (theMutex)
{ {
} }
@ -52,11 +52,11 @@ void BRepMesh_WireInterferenceChecker::operator ()(
//purpose : //purpose :
//======================================================================= //=======================================================================
BRepMesh_WireInterferenceChecker::BRepMesh_WireInterferenceChecker( BRepMesh_WireInterferenceChecker::BRepMesh_WireInterferenceChecker(
const std::vector<BRepMesh_WireChecker::SegmentsTree>& theWires, const std::vector<BRepMeshCol::SegmentsTree>& theWires,
BRepMesh_Status* theStatus) BRepMesh_Status* theStatus)
: myWires(&theWires.front()), : myWires (&theWires.front()),
myWiresNb(theWires.size()), myWiresNb ((Standard_Integer)theWires.size()),
myStatus(theStatus) myStatus (theStatus)
{ {
} }
#endif #endif
@ -74,7 +74,7 @@ void BRepMesh_WireInterferenceChecker::operator ()(
const BRepMeshCol::SegmentsTree& aWireSegTree1 = myWires[theWireId]; const BRepMeshCol::SegmentsTree& aWireSegTree1 = myWires[theWireId];
const BRepMeshCol::Segment* aWireSegments1 = &aWireSegTree1.first->front(); const BRepMeshCol::Segment* aWireSegments1 = &aWireSegTree1.first->front();
const BRepMeshCol::HBndBox2dTree& aWireBoxTree1 = aWireSegTree1.second; const BRepMeshCol::HBndBox2dTree& aWireBoxTree1 = aWireSegTree1.second;
const Standard_Integer aWireLen1 = aWireSegTree1.first->size(); const Standard_Integer aWireLen1 = (Standard_Integer)aWireSegTree1.first->size();
for (Standard_Integer aWireIt = theWireId; aWireIt < myWiresNb; ++aWireIt) for (Standard_Integer aWireIt = theWireId; aWireIt < myWiresNb; ++aWireIt)
{ {
@ -91,7 +91,7 @@ void BRepMesh_WireInterferenceChecker::operator ()(
const BRepMeshCol::Segment* aWireSegments2 = &aWireSegTree2.first->front(); const BRepMeshCol::Segment* aWireSegments2 = &aWireSegTree2.first->front();
const BRepMeshCol::HBndBox2dTree& aWireBoxTree2 = aWireSegTree2.second; const BRepMeshCol::HBndBox2dTree& aWireBoxTree2 = aWireSegTree2.second;
BRepMesh_WireChecker::BndBox2dTreeSelector aSelector(aWireSegTree2.first->size()); BRepMesh_WireChecker::BndBox2dTreeSelector aSelector ((Standard_Integer)aWireSegTree2.first->size());
for (Standard_Integer aSegmentId1 = 0; aSegmentId1 < aWireLen1; ++aSegmentId1) for (Standard_Integer aSegmentId1 = 0; aSegmentId1 < aWireLen1; ++aSegmentId1)
{ {
#ifdef HAVE_TBB #ifdef HAVE_TBB

2
src/BRepMesh/BRepMesh_WireInterferenceChecker.hxx
View File

@ -61,7 +61,7 @@ public:
//! \param theWires wires that should be checked. //! \param theWires wires that should be checked.
//! \param theStatus shared flag to set status of the check. //! \param theStatus shared flag to set status of the check.
BRepMesh_WireInterferenceChecker( BRepMesh_WireInterferenceChecker(
const std::vector<BRepMesh_WireChecker::SegmentsTree>& theWires, const std::vector<BRepMeshCol::SegmentsTree>& theWires,
BRepMesh_Status* theStatus); BRepMesh_Status* theStatus);
#endif #endif