From 434a2cb1b98e5fa5abaadd4be91c0e4398992e4b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 15 Jan 2018 15:59:40 +0000
Subject: [PATCH] ENH: primitiveMesh: updated C++

---
 .../primitiveMesh/primitiveMeshCellPoints.C       | 15 ++++-----------
 .../meshes/primitiveMesh/primitiveMeshEdges.C     | 14 ++++----------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
index 0f6b1ce4d3..0f96e519cc 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCellPoints.C
@@ -73,14 +73,9 @@ const Foam::labelList& Foam::primitiveMesh::cellPoints
 
         set.clear();
 
-        forAll(cFaces, i)
+        for (const label facei : cFaces)
         {
-            const labelList& f = fcs[cFaces[i]];
-
-            forAll(f, fp)
-            {
-                set.insert(f[fp]);
-            }
+            set.insert(fcs[facei]);
         }
 
         storage.clear();
@@ -89,9 +84,9 @@ const Foam::labelList& Foam::primitiveMesh::cellPoints
             storage.setCapacity(set.size());
         }
 
-        forAllConstIter(labelHashSet, set, iter)
+        for (const label pointi : set)
         {
-            storage.append(iter.key());
+            storage.append(pointi);
         }
 
         return storage;
@@ -105,6 +100,4 @@ const Foam::labelList& Foam::primitiveMesh::cellPoints(const label celli) const
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
index 4790af73c1..cc91132dc6 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshEdges.C
@@ -644,26 +644,20 @@ const Foam::labelList& Foam::primitiveMesh::cellEdges
 
         set.clear();
 
-        forAll(cFaces, i)
+        for (const label facei : cFaces)
         {
-            const labelList& fe = faceEdges(cFaces[i]);
-
-            forAll(fe, feI)
-            {
-                set.insert(fe[feI]);
-            }
+            set.insert(faceEdges(facei));
         }
 
         storage.clear();
-
         if (set.size() > storage.capacity())
         {
             storage.setCapacity(set.size());
         }
 
-        forAllConstIter(labelHashSet, set, iter)
+        for (const label edgei : set)
         {
-            storage.append(iter.key());
+            storage.append(edgei);
         }
 
         return storage;