From 1fa4221bc8906d02151aad2c1b9fa9983a51e626 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 25 Nov 2020 12:38:07 +0100
Subject: [PATCH] COMP: fix label ambiguity

---
 .../masterUncollatedFileOperation.C                         | 4 ++--
 .../polyTopoChange/polyTopoChange/addPatchCellLayer.C       | 6 +++---
 src/meshTools/output/foamVtkInternalMeshWriter.C            | 2 +-
 src/meshTools/output/foamVtkPatchMeshWriter.C               | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
index 6adb7eada4..64d99bee45 100644
--- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
+++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
@@ -657,7 +657,7 @@ Foam::fileOperations::masterUncollatedFileOperation::read
                 {
                     // Note: handle compression ourselves since size cannot
                     // be determined without actually uncompressing
-                    readAndSend(fPath, labelList(1, proci), pBufs);
+                    readAndSend(fPath, labelList(one{}, proci), pBufs);
                 }
             }
         }
@@ -2390,7 +2390,7 @@ Foam::fileOperations::masterUncollatedFileOperation::NewIFstream
                     readAndSend
                     (
                         filePaths[proci],
-                        labelList(1, proci),
+                        labelList(one{}, proci),
                         pBufs
                     );
                 }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index eb84d1aaf2..7aba98859a 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -968,21 +968,21 @@ void Foam::addPatchCellLayer::globalEdgeInfo
         mesh,
         meshEdgeToFace,
         maxEqOp<label>(),
-        -1
+        label(-1)
     );
     syncTools::syncEdgeList
     (
         mesh,
         meshEdgeToPatch,
         maxEqOp<label>(),
-        -1
+        label(-1)
     );
     syncTools::syncEdgeList
     (
         mesh,
         meshEdgeToZone,
         maxEqOp<label>(),
-        -1
+        label(-1)
     );
 //    // Note: flipMap not yet done. Needs edge orientation. This is handled
 //    // later on.
diff --git a/src/meshTools/output/foamVtkInternalMeshWriter.C b/src/meshTools/output/foamVtkInternalMeshWriter.C
index d48b583016..1e5c3b3839 100644
--- a/src/meshTools/output/foamVtkInternalMeshWriter.C
+++ b/src/meshTools/output/foamVtkInternalMeshWriter.C
@@ -714,7 +714,7 @@ bool Foam::vtk::internalMeshWriter::writeProcIDs()
         // Per-processor ids
         for (const int proci : Pstream::allProcs())
         {
-            vtk::write(format(), proci, procMaps.localSize(proci));
+            vtk::write(format(), label(proci), procMaps.localSize(proci));
         }
 
         format().flush();
diff --git a/src/meshTools/output/foamVtkPatchMeshWriter.C b/src/meshTools/output/foamVtkPatchMeshWriter.C
index fc66f32ee4..dce7bfde29 100644
--- a/src/meshTools/output/foamVtkPatchMeshWriter.C
+++ b/src/meshTools/output/foamVtkPatchMeshWriter.C
@@ -689,7 +689,7 @@ bool Foam::vtk::patchMeshWriter::writeProcIDs()
             // Per-processor ids
             for (const int proci : Pstream::allProcs())
             {
-                vtk::write(format(), proci, procSizes.localSize(proci));
+                vtk::write(format(), label(proci), procSizes.localSize(proci));
             }
 
             good = true;