From df3b406ef82a2a2380d1be4f15b49de0b74ef399 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 11 May 2018 17:18:52 +0100 Subject: [PATCH] COMP: resolve faceZone constructor ambiguity for gcc 4.8.1 --- src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C | 6 +++--- src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C index cd2fac95cb..8bf7480557 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C @@ -266,7 +266,7 @@ Foam::faceZone::faceZone ( const word& name, const labelUList& addr, - const boolList& fm, + const boolUList& fm, const label index, const faceZoneMesh& zm ) @@ -328,7 +328,7 @@ Foam::faceZone::faceZone ( const faceZone& origZone, const labelUList& addr, - const boolList& fm, + const boolUList& fm, const label index, const faceZoneMesh& zm ) @@ -468,7 +468,7 @@ void Foam::faceZone::resetAddressing void Foam::faceZone::resetAddressing ( const labelUList& addr, - const boolList& flipMap + const boolUList& flipMap ) { clearAddressing(); diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H index 50a06cc512..770e018b10 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H +++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H @@ -177,7 +177,7 @@ public: ( const word& name, const labelUList& addr, - const boolList& fm, + const boolUList& fm, const label index, const faceZoneMesh& zm ); @@ -208,7 +208,7 @@ public: ( const faceZone& origZone, const labelUList& addr, - const boolList& fm, + const boolUList& fm, const label index, const faceZoneMesh& zm ); @@ -236,7 +236,7 @@ public: virtual autoPtr clone ( const labelUList& addr, - const boolList& fm, + const boolUList& fm, const label index, const faceZoneMesh& zm ) const @@ -309,7 +309,7 @@ public: virtual void resetAddressing ( const labelUList& addr, - const boolList& flipMap + const boolUList& flipMap ); //- Move reset addressing - use uniform flip map value