diff --git a/src/Mod/Mesh/App/Core/Evaluation.cpp b/src/Mod/Mesh/App/Core/Evaluation.cpp index d6184e5c3ad8..333e51025f5f 100644 --- a/src/Mod/Mesh/App/Core/Evaluation.cpp +++ b/src/Mod/Mesh/App/Core/Evaluation.cpp @@ -368,8 +368,7 @@ bool MeshEvalTopology::Evaluate () else { if (count > 2) { // Edge that is shared by more than 2 facets - nonManifoldList.push_back(std::make_pair - (p0, p1)); + nonManifoldList.push_back(std::make_pair(p0, p1)); nonManifoldFacets.push_back(facets); } @@ -395,7 +394,7 @@ void MeshEvalTopology::GetFacetManifolds (std::vector &raclFacetI for (int i = 0; i < 3; i++) { unsigned long ulPt0 = std::min(pI->_aulPoints[i], pI->_aulPoints[(i+1)%3]); unsigned long ulPt1 = std::max(pI->_aulPoints[i], pI->_aulPoints[(i+1)%3]); - std::pair edge = std::make_pair(ulPt0, ulPt1); + std::pair edge = std::make_pair(ulPt0, ulPt1); if (std::find(nonManifoldList.begin(), nonManifoldList.end(), edge) != nonManifoldList.end()) raclFacetIndList.push_back(pI - rclFAry.begin()); @@ -745,8 +744,7 @@ void MeshEvalSelfIntersection::GetIntersections(std::vector(*it,*jt)); + intersection.push_back(std::make_pair (*it,*jt)); } } } diff --git a/src/Mod/Mesh/App/Core/MeshKernel.cpp b/src/Mod/Mesh/App/Core/MeshKernel.cpp index 524431938149..fb4ce96b38e6 100644 --- a/src/Mod/Mesh/App/Core/MeshKernel.cpp +++ b/src/Mod/Mesh/App/Core/MeshKernel.cpp @@ -193,7 +193,7 @@ unsigned long MeshKernel::AddFacets(const std::vector &rclFAry) unsigned long ulT1 = pF->_aulPoints[(i+1)%3]; unsigned long ulP0 = std::min(ulT0, ulT1); unsigned long ulP1 = std::max(ulT0, ulT1); - edgeMap[std::make_pair(ulP0, ulP1)].push_front(k); + edgeMap[std::make_pair(ulP0, ulP1)].push_front(k); } } @@ -210,7 +210,7 @@ unsigned long MeshKernel::AddFacets(const std::vector &rclFAry) unsigned long ulT1 = pF->_aulPoints[(i+1)%3]; unsigned long ulP0 = std::min(ulT0, ulT1); unsigned long ulP1 = std::max(ulT0, ulT1); - std::pair edge = std::make_pair(ulP0, ulP1); + std::pair edge = std::make_pair(ulP0, ulP1); std::map, std::list >::iterator pI = edgeMap.find(edge); // Does the current facet share the same edge? if (pI != edgeMap.end()) { diff --git a/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp b/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp index c0aa18656b21..bc44c0c5bbd6 100644 --- a/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp +++ b/src/Mod/Mesh/App/Core/TopoAlgorithm.cpp @@ -444,7 +444,7 @@ void MeshTopoAlgorithm::AdjustEdgesToCurvatureDirection() unsigned long ulT1 = jt->_aulPoints[(i+1)%3]; unsigned long ulP0 = std::min(ulT0, ulT1); unsigned long ulP1 = std::max(ulT0, ulT1); - aclEdgeMap[std::make_pair(ulP0, ulP1)].push_front(k); + aclEdgeMap[std::make_pair(ulP0, ulP1)].push_front(k); aIdx.push_back( (int)jt->_aulPoints[i] ); } } diff --git a/src/Mod/Mesh/App/Mesh.cpp b/src/Mod/Mesh/App/Mesh.cpp index 4add7a0b13db..5181c77edd08 100644 --- a/src/Mod/Mesh/App/Mesh.cpp +++ b/src/Mod/Mesh/App/Mesh.cpp @@ -1147,8 +1147,7 @@ void MeshObject::removeSelfIntersections(const std::vector& indic for (it = indices.begin(); it != indices.end(); ) { unsigned long id1 = *it; ++it; unsigned long id2 = *it; ++it; - selfIntersections.push_back(std::make_pair - (id1,id2)); + selfIntersections.push_back(std::make_pair(id1,id2)); } if (!selfIntersections.empty()) { diff --git a/src/Mod/Mesh/Gui/ViewProviderDefects.cpp b/src/Mod/Mesh/Gui/ViewProviderDefects.cpp index 7931f1b5f3fa..af9e036717ff 100644 --- a/src/Mod/Mesh/Gui/ViewProviderDefects.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderDefects.cpp @@ -646,8 +646,7 @@ void ViewProviderMeshSelfIntersections::showDefects(const std::vector(id1,id2)); + intersection.push_back(std::make_pair(id1,id2)); } std::vector > lines;