From dc57c016ae94dd5a86f4b5ffe43084659aff1292 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 1 May 2017 21:27:42 +0200
Subject: [PATCH] BUG: comparison with incorrect construction tables
- previously hidden when hashtable used a static method and a
different class for end()
---
.../coordinateRotation/coordinateRotationNew.C | 16 +++++++++-------
.../thermophysicalFunction.C | 4 ++--
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
index 02b111038be..ef1a0a0a278 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
@@ -30,22 +30,24 @@ License
Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
(
- const dictionary& dict, const objectRegistry& obr
+ const dictionary& dict,
+ const objectRegistry& obr
)
{
if (debug)
{
- Pout<< "coordinateRotation::New(const dictionary&) : "
+ Pout<< "coordinateRotation::New"
+ "(const dictionary&, const objectRegistry&) : "
<< "constructing coordinateRotation"
<< endl;
}
- word rotType = dict.lookup("type");
+ const word rotType = dict.lookup("type");
objectRegistryConstructorTable::iterator cstrIter =
objectRegistryConstructorTablePtr_->find(rotType);
- if (cstrIter == dictionaryConstructorTablePtr_->end())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
@@ -54,7 +56,7 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
<< rotType << nl << nl
<< "Valid coordinateRotation types are :" << nl
<< "[default: axes ]"
- << dictionaryConstructorTablePtr_->sortedToc()
+ << objectRegistryConstructorTablePtr_->sortedToc()
<< exit(FatalIOError);
}
@@ -74,12 +76,12 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
<< endl;
}
- word rotType = dict.lookup("type");
+ const word rotType = dict.lookup("type");
dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(rotType);
- if (cstrIter == dictionaryConstructorTablePtr_->end())
+ if (!cstrIter.found())
{
FatalIOErrorInFunction
(
diff --git a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
index 16e8f0971a8..f26d2426812 100644
--- a/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
+++ b/src/thermophysicalModels/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
@@ -55,7 +55,7 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
IstreamConstructorTable::iterator cstrIter =
IstreamConstructorTablePtr_->find(thermophysicalFunctionType);
- if (cstrIter == IstreamConstructorTablePtr_->end())
+ if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown thermophysicalFunction type "
@@ -87,7 +87,7 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(thermophysicalFunctionType);
- if (cstrIter == IstreamConstructorTablePtr_->end())
+ if (!cstrIter.found())
{
FatalErrorInFunction
<< "Unknown thermophysicalFunction type "
--
GitLab