From e2bc0b55b9f7ff8e8d2214008309ba02a6c2d73e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 2 Jan 2019 15:56:54 +0100
Subject: [PATCH] COMP: use std::move() explicitly to avoid copying

---
 .../conformalVoronoiMeshCalcDualMesh.C                 |  2 +-
 .../conformalVoronoiMesh/conformalVoronoiMeshIO.C      |  9 ++++-----
 .../conformalVoronoiMesh/indexedCell/indexedCellI.H    |  2 +-
 .../decompositionMethods/manualDecomp/manualDecomp.C   | 10 ++++++----
 .../renumberMethods/manualRenumber/manualRenumber.C    |  7 +++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 14f7a05b48..94123d551c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -988,7 +988,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findOffsetPatchFaces
         offsetBoundaryCells.write();
     }
 
-    return offsetBoundaryCells;
+    return std::move(offsetBoundaryCells);
 }
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 318822e6c7..744c9c4b6b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -1355,11 +1355,10 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findRemainingProtrusionSet
         protrudingCells.insert(pCells);
     }
 
-    label protrudingCellsSize = protrudingCells.size();
+    const label protrudingCellsSize =
+        returnReduce(protrudingCells.size(), sumOp<label>());
 
-    reduce(protrudingCellsSize, sumOp<label>());
-
-    if (foamyHexMeshControls().objOutput() && protrudingCellsSize > 0)
+    if (foamyHexMeshControls().objOutput() && protrudingCellsSize)
     {
         Info<< nl << "Found " << protrudingCellsSize
             << " cells protruding from the surface, writing cellSet "
@@ -1369,7 +1368,7 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::findRemainingProtrusionSet
         protrudingCells.write();
     }
 
-    return protrudingCells;
+    return std::move(protrudingCells);
 }
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
index 2b1d991a69..3a109e27b0 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedCell/indexedCellI.H
@@ -363,7 +363,7 @@ CGAL::indexedCell<Gt, Cb>::globallyOrderedCellVertices
         tVGI[i] = vertexMap[i];
     }
 
-    return tVGI;
+    return std::move(tVGI);
 }
 
 
diff --git a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
index 1077871f95..747824ecc1 100644
--- a/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/manualDecomp/manualDecomp.C
@@ -98,7 +98,6 @@ Foam::labelList Foam::manualDecomp::decompose
     );
 
     // Check if the final decomposition is OK
-
     if (finalDecomp.size() != points.size())
     {
         FatalErrorInFunction
@@ -111,18 +110,21 @@ Foam::labelList Foam::manualDecomp::decompose
             << exit(FatalError);
     }
 
-    if (min(finalDecomp) < 0 || max(finalDecomp) > nDomains_ - 1)
+    const label minVal = min(finalDecomp);
+    const label maxVal = max(finalDecomp);
+
+    if (minVal < 0 || maxVal >= nDomains_)
     {
         FatalErrorInFunction
             << "According to the decomposition, cells assigned to "
             << "impossible processor numbers.  Min processor = "
-            << min(finalDecomp) << " Max processor = " << max(finalDecomp)
+            << minVal << " Max processor = " << maxVal
             << ".\n" << "Manual decomposition data read from file "
             << dataFile_ << "." << endl
             << exit(FatalError);
     }
 
-    return finalDecomp;
+    return std::move(finalDecomp);
 }
 
 
diff --git a/src/renumber/renumberMethods/manualRenumber/manualRenumber.C b/src/renumber/renumberMethods/manualRenumber/manualRenumber.C
index 0b960137b7..a7277af374 100644
--- a/src/renumber/renumberMethods/manualRenumber/manualRenumber.C
+++ b/src/renumber/renumberMethods/manualRenumber/manualRenumber.C
@@ -76,8 +76,7 @@ Foam::labelList Foam::manualRenumber::renumber
         )
     );
 
-    // check if the final renumbering is OK
-
+    // Check if the final renumbering is OK
     if (newToOld.size() != points.size())
     {
         FatalErrorInFunction
@@ -94,7 +93,7 @@ Foam::labelList Foam::manualRenumber::renumber
     labelList oldToNew(points.size(), -1);
     forAll(newToOld, i)
     {
-        label origCelli = newToOld[i];
+        const label origCelli = newToOld[i];
 
         if (origCelli < 0 || origCelli >= points.size())
         {
@@ -122,7 +121,7 @@ Foam::labelList Foam::manualRenumber::renumber
         }
     }
 
-    return newToOld;
+    return std::move(newToOld);
 }