From 45c29be34170f5992499024cd2edf5e42d1c347d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 2 May 2017 13:33:40 +0200
Subject: [PATCH] COMP: avoid clang compiler warnings
---
.../DelaunayMesh/DistributedDelaunayMesh.C | 7 +------
src/meshTools/edgeFaceCirculator/edgeFaceCirculator.C | 6 +++++-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index f13d908eb03..97311eef3cb 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 9149eaf9200..40d52a2fba2 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
--
GitLab