From b016b1664e5c6eae79e57db4a66b757c0f69d3e6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 12 Nov 2018 12:43:33 +0100
Subject: [PATCH] COMP: use typeName_() accessors for building fieldTypes
- resolves better on some compilers.
---
src/OpenFOAM/fields/Fields/fieldTypes.C | 12 +++++------
.../GeometricFields/pointFields/pointFields.C | 10 +++++-----
src/finiteArea/fields/areaFields/areaFields.C | 10 +++++-----
src/finiteVolume/fields/volFields/volFields.C | 20 +++++++++----------
4 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/OpenFOAM/fields/Fields/fieldTypes.C b/src/OpenFOAM/fields/Fields/fieldTypes.C
index aaa9f3f9432..9c1a8a55469 100644
--- a/src/OpenFOAM/fields/Fields/fieldTypes.C
+++ b/src/OpenFOAM/fields/Fields/fieldTypes.C
@@ -35,12 +35,12 @@ License
const Foam::wordList Foam::fieldTypes::basic
({
- Foam::labelIOField::typeName,
- Foam::scalarIOField::typeName,
- Foam::vectorIOField::typeName,
- Foam::sphericalTensorIOField::typeName,
- Foam::symmTensorIOField::typeName,
- Foam::tensorIOField::typeName
+ Foam::labelIOField::typeName_(),
+ Foam::scalarIOField::typeName_(),
+ Foam::vectorIOField::typeName_(),
+ Foam::sphericalTensorIOField::typeName_(),
+ Foam::symmTensorIOField::typeName_(),
+ Foam::tensorIOField::typeName_()
});
diff --git a/src/OpenFOAM/fields/GeometricFields/pointFields/pointFields.C b/src/OpenFOAM/fields/GeometricFields/pointFields/pointFields.C
index bbd392e38c3..c115a066fc2 100644
--- a/src/OpenFOAM/fields/GeometricFields/pointFields/pointFields.C
+++ b/src/OpenFOAM/fields/GeometricFields/pointFields/pointFields.C
@@ -58,11 +58,11 @@ namespace Foam
const Foam::wordList Foam::fieldTypes::point
({
- Foam::pointScalarField::typeName,
- Foam::pointVectorField::typeName,
- Foam::pointSphericalTensorField::typeName,
- Foam::pointSymmTensorField::typeName,
- Foam::pointTensorField::typeName
+ Foam::pointScalarField::typeName_(),
+ Foam::pointVectorField::typeName_(),
+ Foam::pointSphericalTensorField::typeName_(),
+ Foam::pointSymmTensorField::typeName_(),
+ Foam::pointTensorField::typeName_()
});
diff --git a/src/finiteArea/fields/areaFields/areaFields.C b/src/finiteArea/fields/areaFields/areaFields.C
index be85c01adf7..2090d7bb461 100644
--- a/src/finiteArea/fields/areaFields/areaFields.C
+++ b/src/finiteArea/fields/areaFields/areaFields.C
@@ -81,11 +81,11 @@ void GeometricField<scalar, faPatchField, areaMesh>::replace
const Foam::wordList Foam::fieldTypes::area
({
- Foam::areaScalarField::typeName,
- Foam::areaVectorField::typeName,
- Foam::areaSphericalTensorField::typeName,
- Foam::areaSymmTensorField::typeName,
- Foam::areaTensorField::typeName
+ Foam::areaScalarField::typeName_(),
+ Foam::areaVectorField::typeName_(),
+ Foam::areaSphericalTensorField::typeName_(),
+ Foam::areaSymmTensorField::typeName_(),
+ Foam::areaTensorField::typeName_()
});
diff --git a/src/finiteVolume/fields/volFields/volFields.C b/src/finiteVolume/fields/volFields/volFields.C
index be0ea839831..30b1de4c45c 100644
--- a/src/finiteVolume/fields/volFields/volFields.C
+++ b/src/finiteVolume/fields/volFields/volFields.C
@@ -87,21 +87,21 @@ void GeometricField<scalar, fvPatchField, volMesh>::replace
const Foam::wordList Foam::fieldTypes::internal
({
- Foam::volScalarField::Internal::typeName,
- Foam::volVectorField::Internal::typeName,
- Foam::volSphericalTensorField::Internal::typeName,
- Foam::volSymmTensorField::Internal::typeName,
- Foam::volTensorField::Internal::typeName
+ Foam::volScalarField::Internal::typeName_(),
+ Foam::volVectorField::Internal::typeName_(),
+ Foam::volSphericalTensorField::Internal::typeName_(),
+ Foam::volSymmTensorField::Internal::typeName_(),
+ Foam::volTensorField::Internal::typeName_()
});
const Foam::wordList Foam::fieldTypes::volume
({
- Foam::volScalarField::typeName,
- Foam::volVectorField::typeName,
- Foam::volSphericalTensorField::typeName,
- Foam::volSymmTensorField::typeName,
- Foam::volTensorField::typeName
+ Foam::volScalarField::typeName_(),
+ Foam::volVectorField::typeName_(),
+ Foam::volSphericalTensorField::typeName_(),
+ Foam::volSymmTensorField::typeName_(),
+ Foam::volTensorField::typeName_()
});
--
GitLab