diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C index f13d908eb03d0f86d1c0773ac8613e3595006d59..97311eef3cbdefdb4f6412ac96b75545d673df35 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C @@ -536,12 +536,7 @@ Foam::label Foam::DistributedDelaunayMesh<Triangulation>::referVertices if (!pointsNotInserted.empty()) { - for - ( - labelPairHashSet::const_iterator iter = pointsNotInserted.begin(); - iter != pointsNotInserted.end(); - ++iter - ) + forAllConstIters(pointsNotInserted, iter) { if (receivedVertices.found(iter.key())) { diff --git a/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C b/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C index 9149eaf92004d857a4689402ac26136cfffd0119..40d52a2fba2bf708c222f4f21ddef7e94131051d 100644 --- a/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C +++ b/src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C @@ -25,12 +25,16 @@ License #include "edgeFaceCirculator.H" #include "primitiveMesh.H" +#include "nullObject.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // const Foam::edgeFaceCirculator Foam::edgeFaceCirculator::endConstIter ( - *reinterpret_cast<primitiveMesh*>(0), // primitiveMesh + *reinterpret_cast<const primitiveMesh*> + ( + NullObject::nullObject.pointer() // nullptr dummy + ), -1, // faceLabel false, // ownerSide -1, // index