From fd4782f7544a9b615204224328588d598650d56e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 11 Dec 2017 10:22:06 +0100
Subject: [PATCH] COMP: adjustments for 64-bit label-size

---
 ...agrangianRedistributorRedistributeFields.C | 10 ++++-----
 .../decomposedBlockData/decomposedBlockData.C | 22 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C
index c53514fc83..6dc7e5dbe2 100644
--- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C
+++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C
@@ -105,7 +105,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFields
                     IOobject::NO_WRITE,
                     false
                 ),
-                0
+                label(0)
             );
 
             map.distribute(field);
@@ -179,7 +179,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFieldFields
             Info<< "        " <<  objectNames[i] << endl;
 
             // Read if present
-            CompactIOField<Field<Type>, Type > field
+            CompactIOField<Field<Type>, Type> field
             (
                 IOobject
                 (
@@ -191,7 +191,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFieldFields
                     IOobject::NO_WRITE,
                     false
                 ),
-                0
+                label(0)
             );
 
             // Distribute
@@ -259,7 +259,7 @@ void Foam::parLagrangianRedistributor::readLagrangianFields
                     IOobject::READ_IF_PRESENT,
                     IOobject::NO_WRITE
                 ),
-                0
+                label(0)
             );
 
             fieldPtr->store();
@@ -277,7 +277,7 @@ void Foam::parLagrangianRedistributor::redistributeStoredLagrangianFields
 {
     HashTable<Container*> fields
     (
-        cloud.lookupClass<Container >()
+        cloud.lookupClass<Container>()
     );
 
     if (fields.size())
diff --git a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
index 95145381de..6d315cd7a6 100644
--- a/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
+++ b/src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
@@ -366,7 +366,7 @@ bool Foam::decomposedBlockData::readBlocks
             (
                 label proci = 1;
                 proci < UPstream::nProcs(comm);
-                proci++
+                ++proci
             )
             {
                 List<char> elems(is);
@@ -423,7 +423,7 @@ bool Foam::decomposedBlockData::readBlocks
             (
                 label proci = 1;
                 proci < UPstream::nProcs(comm);
-                proci++
+                ++proci
             )
             {
                 List<char> elems(is);
@@ -506,7 +506,7 @@ Foam::autoPtr<Foam::ISstream> Foam::decomposedBlockData::readBlocks
             (
                 label proci = 1;
                 proci < UPstream::nProcs(comm);
-                proci++
+                ++proci
             )
             {
                 is >> data;
@@ -589,7 +589,7 @@ Foam::autoPtr<Foam::ISstream> Foam::decomposedBlockData::readBlocks
             (
                 label proci = 1;
                 proci < UPstream::nProcs(comm);
-                proci++
+                ++proci
             )
             {
                 List<char> elems(is);
@@ -661,8 +661,8 @@ void Foam::decomposedBlockData::gather
 
     char* data0Ptr = reinterpret_cast<char*>(datas.begin());
 
-    labelList recvOffsets;
-    labelList recvSizes;
+    List<int> recvOffsets;
+    List<int> recvSizes;
     if (UPstream::master())
     {
         recvOffsets.setSize(nProcs);
@@ -716,7 +716,7 @@ void Foam::decomposedBlockData::gatherSlaveData
             sliceSizes[proci] = int(recvSizes[proci]);
             sliceOffsets[proci] = totalSize;
             totalSize += sliceSizes[proci];
-            proci++;
+            ++proci;
         }
         sliceOffsets[proci] = totalSize;
         recvData.setSize(totalSize);
@@ -798,7 +798,7 @@ bool Foam::decomposedBlockData::writeBlocks
 
             label slaveOffset = 0;
 
-            for (label proci = 1; proci < nProcs; proci++)
+            for (label proci = 1; proci < nProcs; ++proci)
             {
                 os << nl << nl << "// Processor" << proci << nl;
                 start[proci] = os.stdStream().tellp();
@@ -827,7 +827,7 @@ bool Foam::decomposedBlockData::writeBlocks
             }
             // Write slaves
             List<char> elems;
-            for (label proci = 1; proci < nProcs; proci++)
+            for (label proci = 1; proci < nProcs; ++proci)
             {
                 elems.setSize(recvSizes[proci]);
                 IPstream::read
@@ -899,7 +899,7 @@ bool Foam::decomposedBlockData::writeBlocks
                 )
                 {
                     totalSize += recvSizes[proci];
-                    proci++;
+                    ++proci;
                 }
 
                 masterData[1] = proci-masterData[0];
@@ -948,7 +948,7 @@ bool Foam::decomposedBlockData::writeBlocks
                 (
                     label proci = startAndSize[0];
                     proci < startAndSize[0]+startAndSize[1];
-                    proci++
+                    ++proci
                 )
                 {
                     os << nl << nl << "// Processor" << proci << nl;